From: skillzero@gmail.com
To: git@vger.kernel.org
Subject: git merge remote branch says "Merge commit ..."?
Date: Thu, 21 May 2009 12:50:48 -0700 [thread overview]
Message-ID: <2729632a0905211250v4e7537caybe9e703c14361b5f@mail.gmail.com> (raw)
I noticed that if I do 'git merge origin/branch' that the log message
says (using --log):
Merge commit 'origin/branch'
* commit 'origin/branch':
Fixed some bug.
If I do the same thing from a local tracking branch of origin/branch, it says:
Merge branch 'branch'
* branch:
Fixed some bug.
Is it expected that it say "commit" instead of "branch" when the
branch is not a local tracking branch? I sometimes merge from remote
branches when I don't need to do anything with that branch locally
(e.g. I already did the work on another computer and I'm just merging
the result into my test machine before I push to the shared server).
next reply other threads:[~2009-05-21 19:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-21 19:50 skillzero [this message]
2009-05-22 7:49 ` git merge remote branch says "Merge commit ..."? Jeff King
2009-05-22 17:29 ` Eric Raible
2009-05-22 17:54 ` Jeff King
2009-05-22 18:08 ` git merge remote branch says Eric Raible
2009-05-22 18:10 ` Jeff King
2009-05-22 18:30 ` git merge remote branch says "Merge commit ..."? Johannes Sixt
2009-05-23 9:17 ` Jeff King
2009-05-23 9:26 ` Junio C Hamano
2009-05-25 9:44 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2729632a0905211250v4e7537caybe9e703c14361b5f@mail.gmail.com \
--to=skillzero@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).