Shawn O. Pearce 6e2931a8ed 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>

2007-01-14 23:17:32 -08:00

4.3 KiB

Executable File

Raw Blame History

View Raw