| commit | 6e2931a8ed887bd75ed68085a7e04bc88574d69e | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 15 Jan 2007 06:41:22 +0000 (15 01:41 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 15 Jan 2007 07:17:32 +0000 (14 23:17 -0800) | ||
| tree | a88c0de8e369cbf70b17fbe123305441d70f4c8f | treesnapshot (tar.gz zip) |
| parent | acb4441e0dabaaa666ecae11fdafc27c3691e763 | commitdiff |
Use nice names in conflict markers during cherry-pick/revert.
Always call the current HEAD 'HEAD', and name the patch being
cherry-picked or reverted by its oneline subject rather than
its SHA1. This matches git am's behavior and is done because
users most commonly are cherry-picking by SHA1 rather than by
ref name.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Always call the current HEAD 'HEAD', and name the patch being
cherry-picked or reverted by its oneline subject rather than
its SHA1. This matches git am's behavior and is done because
users most commonly are cherry-picking by SHA1 rather than by
ref name.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-revert.sh | diffblobblamehistory |