From: Stefan Richter <stefanr@s5r6.in-berlin.de>
To: git@vger.kernel.org
Subject: Re: "git-pull --no-commit" should imply --no-ff...?
Date: Sun, 22 Jun 2008 16:01:59 +0200 [thread overview]
Message-ID: <485E5B57.5000307@s5r6.in-berlin.de> (raw)
In-Reply-To: <20080622133606.GA21828@endor.mknod.org>
Graham Wilson wrote:
> On Sat, Jun 21, 2008 at 04:08:51PM +0200, Stefan Richter wrote:
>> 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.
>
> --no-commit to me seems to mean don't commit a merge commit. Maybe what
> you want is something like:
>
> git-diff HEAD foo | git-apply
>
Yes, I obviously got the wrong idea about git-pull --no-commit.
git-diff + git-apply indeed accomplishes what I wanted to do. Thanks,
--
Stefan Richter
-=====-==--- -==- =-==-
http://arcgraph.de/sr/
prev parent reply other threads:[~2008-06-22 14:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-21 14:08 "git-pull --no-commit" should imply --no-ff...? Stefan Richter
2008-06-22 13:36 ` Graham Wilson
2008-06-22 13:49 ` Miklos Vajna
2008-06-22 14:01 ` Stefan Richter [this message]
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=485E5B57.5000307@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