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

Re: How to merge into my working copy?

From
PDPatrick Doyle <wpdster@gmail.com>
Date
Nov 6, 2009, 18:15 UTC
Message-ID
<e2a1d0aa0911061015o412f1ab0k9fbfdb88431d49c9@mail.gmail.com>
In-Reply-To
<7v8wejzgim.fsf@alter.siamese.dyndns.org>
On Fri, Nov 6, 2009 at 12:53 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 5 quoted lines
>
> If you do not have to have your extra "without affecting the index"
> constraint (which I do not see a sensible reason to want to, by the way),
> you can "merge --no-commit that_branch", I think.
>

After bouncing this around a couple of times with Bruce Stephens, and only now noticing that I hit "Reply" instead of "Reply-All"... sigh), I realized that what I wanted was:

$ git merge --squash that_branch $ git reset

I only wanted to affect my working copy, editing and adding things to the index (which I think of as "staging area for my next commit") as I was ready.

--wpd
Previous: Junio C Hamano
Message 4 of 4 in “How to merge into my working copy?”
  1. Patrick DoyleNov 6, 2009
  2. Bruce StephensNov 6, 2009
  3. Junio C HamanoNov 6, 2009
  4. Patrick DoyleNov 6, 2009

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.