Re: parent-filter loses my merged branch -- what am I doing wrong?

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

 




On Jan 19, 2009, at 0:41, Johannes Sixt wrote:

Ask Bjørn Hansen schrieb:
On Sam Villain's recommendation I'm spending a bit of time cleaning up
the branches and merges with git filter-branch, but I don't think I'm
quite understanding how it's supposed to work.

Don't use --parent-filter for this; use grafts. You can see the history in gitk right away. Later run filter-branch without a filter (except perhaps
the tag-name-filter).

Aha - excellent. I didn't understand clearly from the documentation that they'd be "written in stone" by filter-branch. Building the grafts with .git/info/grafts was much much easier.


  - ask

--
http://develooper.com/ - http://askask.com/


--
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]

  Powered by Linux