diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-12-10 07:03:48 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-12 13:33:53 -0800 |
| commit | a7eff1e027270062c4c08f11d63b4103f3d917fe (patch) | |
| tree | e864a734c1ff29005da5a9691e68b7b403add40b /merge-recursive.c | |
| parent | 218b65fbf9428517e739b8bc26680c29910cf1cd (diff) | |
| download | git-a7eff1e027270062c4c08f11d63b4103f3d917fe.tar.gz | |
Revert "reset: Make reset remove the sequencer state"
This reverts commit 95eb88d8ee588d89b4f06d2753ed4d16ab13b39f, which
was a UI experiment that did not reflect how "git reset" actually gets
used. The reversion also fixes a test, indicated in the patch.
Encouraged-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions