From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: jhapk <pradeep.kumar.jha@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Merging branches
Date: Tue, 13 Jul 2010 22:05:17 +0000 [thread overview]
Message-ID: <AANLkTikPdOVCs5aB7Gs5QCFGDIgBm00DO5XPkP39mzIW@mail.gmail.com> (raw)
In-Reply-To: <1279056529462-5289861.post@n2.nabble.com>
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.
next prev parent reply other threads:[~2010-07-13 22:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-13 21:28 Merging branches jhapk
2010-07-13 22:05 ` Ævar Arnfjörð Bjarmason [this message]
2010-07-14 5:24 ` Avery Pennarun
-- strict thread matches above, loose matches on Subject: below --
2012-10-22 16:33 merging branches Коньков Евгений
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=AANLkTikPdOVCs5aB7Gs5QCFGDIgBm00DO5XPkP39mzIW@mail.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=pradeep.kumar.jha@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).