Re: Merging branches

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Jul 13, 2010 at 6:05 PM, Ævar Arnfjörð Bjarmason
<avarab@xxxxxxxxx> wrote:
> On Tue, Jul 13, 2010 at 21:28, jhapk <pradeep.kumar.jha@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]