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

Re: How to merge into my working copy?

From
BSBruce Stephens <bruce.stephens@isode.com>
Date
Nov 6, 2009, 14:59 UTC
Message-ID
<80aayzg0mj.fsf@tiny.isode.net>
In-Reply-To
<e2a1d0aa0911060653t7bbb54ebp948eac0dffeaba64@mail.gmail.com>
Patrick Doyle <wpdster@gmail.com> writes:
[...]
Show 8 quoted lines
> Basically, I created a branch off my mainline branch a few days ago.
> Made some commits on that branch.  Then went back to my mainline
> branch, made a few commits there, and now I would like to make my
> working copy look like a merge of its current state with the changes
> from the branch, minus any associated commits.
>
> I probably should have just used git-stash to tuck those changes away,
> but I didn't.

Rather than spending time worrying about optimal ways to do this, wouldn't it work just to do merge (to get the right tree) followed by rebase -i to get the commits in the way you want (removing the merge, anyway)?

[...]
Previous: Patrick DoyleNext: Junio C Hamano
Message 2 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.