summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorLibravatar Stephen Boyd <bebarino@gmail.com>2009-12-11 16:38:57 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-13 23:17:46 -0800
commit81334502eed1c78f49fc74936b712b3cf32b682a (patch)
treee8e6fc594f99af01c830fd1b95132674c18b84fd /diff-lib.c
parentGit 1.6.5.6 (diff)
downloadtgif-81334502eed1c78f49fc74936b712b3cf32b682a.tar.xz
octopus: make merge process simpler to follow
Its not very easy to understand what heads are being merged given the current output of an octopus merge. Fix this by replacing the sha1 with the (usually) better description in GITHEAD_<SHA1>. Suggested-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions