diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2011-08-04 16:09:12 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-08 09:24:50 -0700 |
| commit | 95eb88d8ee588d89b4f06d2753ed4d16ab13b39f (patch) | |
| tree | ee9bd4f977a3f4c1df67cb42e4d90dc709f90ac9 /t/t4013/diff.log_-SF_master_--max-count=1 | |
| parent | revert: Introduce --reset to remove sequencer state (diff) | |
| download | tgif-95eb88d8ee588d89b4f06d2753ed4d16ab13b39f.tar.xz | |
reset: Make reset remove the sequencer state
Years of muscle memory have trained users to use "git reset --hard" to
remove the branch state after any sort operation. Make it also remove
the sequencer state to facilitate this established workflow:
$ git cherry-pick foo..bar
... conflict encountered ...
$ git reset --hard # Oops, I didn't mean that
$ git cherry-pick quux..bar
... cherry-pick succeeded ...
Guard against accidental removal of the sequencer state by providing
one level of "undo". In the first "reset" invocation,
".git/sequencer" is moved to ".git/sequencer-old"; it is completely
removed only in the second invocation.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.log_-SF_master_--max-count=1')
0 files changed, 0 insertions, 0 deletions