From: Junio C Hamano Date: Sat, 03 Jun 2006 16:50:46 GMT Subject: Re: Gitk feature - show nearby tags Message-ID: <7vy7wedvyx.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <17537.32585.260926.48759@cargo.ozlabs.ibm.com> Paul Mackerras writes: > ... I think that with heads, you > would want to see all the descendent heads, rather than just the > nearest ones (those that aren't descendents of another descendent > head) as I do with tags. What do you think? If one head is a > descendent of another, and both are descendents of the selected > commit, should I show both? That would be useful I think. >> BTW, what's the maintenance/rewind policy on the "new" branch of >> gitk.git? If you are never going to rewind it, I could pull it >> in "next" (and keep pulling your "master" in my "master") for >> wider exposure if you like. > > I intend to pull "new" into "master" shortly, assuming I don't get any > bug reports for the "new" branch. :) > > If you pull my "new" into your "next", and you then pull your "next" > into your "master", and I pull my "new" into my "master", and you pull > my "master" into your "master", won't we end up with duplicate merges? Yes, but I rarely if ever pull "next" as a whole into "master".