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

Re: Merging branches

From
Avery Pennarun <apenwarr@gmail.com>
Date
Jul 14, 2010, 05:24 UTC
Message-ID
<AANLkTimFGQg1KEqpVBvifrLR8_BH_p6s6qswn614s58q@mail.gmail.com>
In-Reply-To
<AANLkTikPdOVCs5aB7Gs5QCFGDIgBm00DO5XPkP39mzIW@mail.gmail.com>

On Tue, Jul 13, 2010 at 6:05 PM, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 8 quoted lines
> On Tue, Jul 13, 2010 at 21:28, jhapk <pradeep.kumar.jha@gmail.com> wrote:
>> I have a git history which looks something like as in the figure above. I
>> want to merge Branch A in Branch B. However, the commits a1, a2 and a3 are
>> ugly and so I don't want those commits in my Branch B log. Is there anyway
>> that I can only pull the final form of Branch A without pulling the whole
>> history of Branch A?
>
> Yes, you use rebase to squash or drop those commits, and then merge the branch.
Or just "git merge --squash".
Have fun,
Avery
Previous: Ævar Arnfjörð Bjarmason
Message 3 of 3 in “Merging branches”
  1. jhapkJul 13, 2010
  2. Ævar Arnfjörð BjarmasonJul 13, 2010
  3. Avery PennarunJul 14, 2010

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.