![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Stephen Boyd <bebarino@gmail.com> | |
| Sat, 12 Dec 2009 00:38:57 +0000 (16:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Dec 2009 07:17:46 +0000 (23:17 -0800) | ||
| commit | 81334502eed1c78f49fc74936b712b3cf32b682a | |
| tree | e8e6fc594f99af01c830fd1b95132674c18b84fd | tree | snapshot |
| parent | 9861b644e045b5ee0e16dea65b44419205090960 | commit | 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 <jari.aalto@cante.net>
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
| git-merge-octopus.sh | diff | blob | history | |
| t/t7602-merge-octopus-many.sh | diff | blob | history |