From: Stefan Richter <stefanr@s5r6.in-berlin.de>
To: git@vger.kernel.org
Subject: "git-pull --no-commit" should imply --no-ff...?
Date: Sat, 21 Jun 2008 16:08:51 +0200 (CEST) [thread overview]
Message-ID: <tkrat.5aa5af8e9968819c@s5r6.in-berlin.de> (raw)
Hi list,
trying "git pull --no-commit . foo" for the first time, I was confused
that --no-commit was a no-op when the pull resulted in a fast-forward.
I.e. HEAD advanced the whole chain of commits to foo. I expected it to
apply the diff of HEAD..foo but not commit them.
I then learned that "git pull --no-ff --no-commit . foo" does what I
wanted. What good does it do to ignore --no-commit in the fast-forward
case unless --no-ff is given?
This is with git 1.5.4.5.
--
Stefan Richter
-=====-==--- -==- =-=-=
http://arcgraph.de/sr/
next reply other threads:[~2008-06-21 14:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-21 14:08 Stefan Richter [this message]
2008-06-22 13:36 ` "git-pull --no-commit" should imply --no-ff...? Graham Wilson
2008-06-22 13:49 ` Miklos Vajna
2008-06-22 14:01 ` Stefan Richter
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=tkrat.5aa5af8e9968819c@s5r6.in-berlin.de \
--to=stefanr@s5r6.in-berlin.de \
--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