git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: "git-pull --no-commit" should imply --no-ff...?

From
SRStefan Richter <stefanr@s5r6.in-berlin.de>
Date
Jun 22, 2008, 14:01 UTC
Message-ID
<485E5B57.5000307@s5r6.in-berlin.de>
In-Reply-To
<20080622133606.GA21828@endor.mknod.org>
Graham Wilson wrote:
Show 11 quoted lines
> 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/
Previous: Miklos Vajna
Message 4 of 4 in “"git-pull --no-commit" should imply --no-ff...?”
  1. Stefan RichterJun 21, 2008
  2. Graham WilsonJun 22, 2008
  3. Miklos VajnaJun 22, 2008
  4. Stefan RichterJun 22, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.