git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9861b64)
octopus: make merge process simpler to follow
authorStephen Boyd <redacted>
Sat, 12 Dec 2009 00:38:57 +0000 (16:38 -0800)
committerJunio C Hamano <redacted>
Mon, 14 Dec 2009 07:17:46 +0000 (23:17 -0800)
commit81334502eed1c78f49fc74936b712b3cf32b682a
treee8e6fc594f99af01c830fd1b95132674c18b84fdtree | snapshot
parent9861b644e045b5ee0e16dea65b44419205090960commit | diff
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 <redacted>
Signed-off-by: Stephen Boyd <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-merge-octopus.sh diff | blob | history
t/t7602-merge-octopus-many.sh diff | blob | history
git clone https://git.99rst.org/PROJECT