Git merge: why I saw some are "Merge branch 'master' of github.com:foo/bar", and some are "Merge remote-tracking branch 'origin/master'"?
In my understanding, "merge" always merge remote tracking branch.
Asked
Active
Viewed 427 times
1
-
In short: you can merge any branch with any other branch. In git merge is just a commit with 2+ parents. – Ivan Nevostruev May 19 '15 at 00:39
1 Answers
2
If you do a git pull, the default merge message will include a reference to the upstream repo and the branch being fetched then merged (like github.com:foo/bar).
If you do a git merge, the default merge message will reference the upstream branch name (like origin/master)
You can see the merge commit message being formed in builtin/fmt-merge-msg.c of git fmt-merge-msg.
