diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-12-11 16:38:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-13 23:17:46 -0800 |
| commit | 81334502eed1c78f49fc74936b712b3cf32b682a (patch) | |
| tree | e8e6fc594f99af01c830fd1b95132674c18b84fd /blob.c | |
| parent | 9861b644e045b5ee0e16dea65b44419205090960 (diff) | |
| download | git-81334502eed1c78f49fc74936b712b3cf32b682a.tar.gz git-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 'blob.c')
0 files changed, 0 insertions, 0 deletions