diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:04:43 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:04 -0700 |
| commit | 13dd255e4abb95895aaef72e2b93564be90cb49c (patch) | |
| tree | 5e72670ec392f0da99883a4a18312763f3dbe6cd /bundle.h | |
| parent | 6239af1c6c272eeb2b15359ff0dc25d769d5ac78 (diff) | |
| download | git-13dd255e4abb95895aaef72e2b93564be90cb49c.tar.gz | |
merge script: improve log message subject
- point out remote-tracking branches as "remote branch
'upstream/master'";
- avoid misleading log messages when a tag and branch
share a name.
This approximates the builtin merge command's behavior well
enough to pass the relevant tests.
Based roughly on v1.6.4.2~10^2 (merge: indicate remote tracking
branches in merge message, 2009-08-09) and v1.6.4.2~10^2~1 (merge: fix
incorrect merge message for ambiguous tag/branch, 2009-08-09).
Cc: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bundle.h')
0 files changed, 0 insertions, 0 deletions