| commit | 9fd389b65002e0e23deb2c7328360f246afec0d4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Nov 2011 02:22:08 +0000 (22 18:22 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Nov 2011 02:22:08 +0000 (22 18:22 -0800) | ||
| tree | 6f18d8e46376adb637fddb8fca407c54021365bc | treesnapshot (tar.gz zip) |
| parent | e14d63198867c545d0662afc00bf7be048bf2231 | commitdiff |
| parent | c427b211b3f5d3f967e5fc7abd526b02f83a7246 | commitdiff |
Merge branch 'jn/revert-quit'
* jn/revert-quit:
revert: remove --reset compatibility option
revert: introduce --abort to cancel a failed cherry-pick
revert: write REVERT_HEAD pseudoref during conflicted revert
revert: improve error message for cherry-pick during cherry-pick
revert: rearrange pick_revisions() for clarity
revert: rename --reset option to --quit
* jn/revert-quit:
revert: remove --reset compatibility option
revert: introduce --abort to cancel a failed cherry-pick
revert: write REVERT_HEAD pseudoref during conflicted revert
revert: improve error message for cherry-pick during cherry-pick
revert: rearrange pick_revisions() for clarity
revert: rename --reset option to --quit