On Tue, Aug 16, 2011 at 11:55 PM, Michael J Gruber
<git@xxxxxxxxxxxxxxxxxxxx> wrote:
> Jon Seymour venit, vidit, dixit 08.08.2011 12:43:
>> On Mon, Aug 8, 2011 at 8:22 PM, Jon Seymour <jon.seymour@xxxxxxxxx> wrote:
>>> On Mon, Aug 8, 2011 at 7:45 PM, Jakub Narębski <jnareb@xxxxxxxxx> wrote:
>>>> On 8/8/11, Jon Seymour <jon.seymour@xxxxxxxxx> wrote:
>>
>> I've also added this...
>>
>> Listing the tips of branches in pu that are not in master
>> ===========================================
>>
>> Suppose you have two aliases defined like so:
>>
>> [alias]
>> oneline = !/usr/bin/xargs -L1 git log --decorate --max-count=1 --oneline
>
> How about
>
> oneline = git log --no-walk --decorate --oneline
I still need to !/usr/bin/xargs -L1m, don't I? The point is to
transform a list of SHA1s into a decorated list. But point taken about
--no-walk being an alternative to --max-count=1.
> git branch --merged origin/pu --contains origin/next
>
> (or with --no-merged, but put it first.)
>
So, the idea with tips is that it will show you the tips of
independent lines of development that have diverged from origin/next
(or before) that have been merged back into origin/pu. This works,
even if you don't have branches assigned to these tips.
In this example:
A-----B---E---F---G---H
\-----C--/ /
\ ----D----/
git tips F will show B, C, D as the tips of branches that have
diverged from the mainline but have merged back in.
If I want to rebuild F' which does not include C, then git tips F
tells me that I have to merge B and D.
The git tips alias abstracts the function of 'git work list
dependency' which is a function of git extension (git work) that I
have been playing around with for a while.
I use git work to manage a private integration branch which includes
all my current published but unintegrated-upstream topics. If I decide
I want to unmerge one of these topics from my integration branch, I'd
do something like:
git work unmerge C
Which does the equivalent of:
git checkout B
git merge D
git rebase --onto HEAD F H
>>
>> which is a list of the tips of branches that are in pu, but not in next.
>
> That's not quite the standard --decorate, is it? ;)
>
Not sure what you mean by not being standard? The main idea about
using --decorate here is to get a dump of any refs that might describe
the identified tips.
jon.
--
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