projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e14d631
c427b21
)
Merge branch 'jn/revert-quit'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 23 Nov 2011 02:22:08 +0000
(18:22 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 23 Nov 2011 02:22:08 +0000
(18:22 -0800)
* 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
Trivial merge