Changes between Version 32 and Version 33 of GitForDarcsUsers

Timestamp:

04/05/11 04:26:25 (2 years ago)

Author:

simonmar

Comment:

--

GitForDarcsUsers

@@ -493 +493 @@
 == darcs unrecord ==
 
-Not sure if this will unrecord any patches except the most recent???
+To unrecord the most recent patch:
+
 {{{
 git reset --soft HEAD^
 }}}
+
+To unrecord a patch other than the most recent one, first you need to re-order patches so that the one you want to unrecord is at the top:
+
+{{{
+git rebase -i <commit>
+}}}
+
+where `<commit>` is the hash of the commit you want to unrecord.  This pops up an editor with the list of patches since `<commit>`, and you can re-order them, squash them together, or remove some altogether.  (Note dangers of rebase, see above).
 
 == darcs unpull ==