diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-15 01:41:22 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-14 23:17:32 -0800 |
| commit | 6e2931a8ed887bd75ed68085a7e04bc88574d69e (patch) | |
| tree | a88c0de8e369cbf70b17fbe123305441d70f4c8f /builtin-reflog.c | |
| parent | acb4441e0dabaaa666ecae11fdafc27c3691e763 (diff) | |
| download | git-6e2931a8ed887bd75ed68085a7e04bc88574d69e.tar.gz | |
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>
Diffstat (limited to 'builtin-reflog.c')
0 files changed, 0 insertions, 0 deletions