Use nice names in conflict markers during cherry-pick/revert.
authorShawn O. Pearce <spearce@spearce.org>
Mon, 15 Jan 2007 06:41:22 +0000 (01:41 -0500)
committerJunio C Hamano <junkio@cox.net>
Mon, 15 Jan 2007 07:17:32 +0000 (23:17 -0800)
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>
No differences found