summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-21 11:52:33 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-21 11:52:33 -0700
commitde224962148c6b32ea2a6eba85578cc16d6c86c1 (patch)
tree3f425f1946f018079e57a4947d02af55ca319104 /Documentation/git-merge.txt
parente379fdf34fee96cd205be83ff4e71699bdc32b18 (diff)
downloadgit-de224962148c6b32ea2a6eba85578cc16d6c86c1.tar.gz
t3033: avoid 'ambiguous refs' warning
Because "test_commit five" creates a commit and point it with a tag 'five', doing so on a branch whose name is 'five' will later result in an 'ambiguous refs' warning. Even though it is harmless because all the later references are for the tag, there is no reason for the branch to be called 'five'. Give it a name that describes its purpose more clearly, i.e. "newroot". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions