Changes between Version 32 and Version 33 of GitForDarcsUsers


Ignore:
Timestamp:
Apr 5, 2011 11:26:25 AM (4 years ago)
Author:
simonmar
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • GitForDarcsUsers

    v32 v33  
    493493== darcs unrecord ==
    494494
    495 Not sure if this will unrecord any patches except the most recent???
     495To unrecord the most recent patch:
     496
    496497{{{
    497498git reset --soft HEAD^
    498499}}}
     500
     501To 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:
     502
     503{{{
     504git rebase -i <commit>
     505}}}
     506
     507where `<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).
    499508
    500509== darcs unpull ==