From: Junio C Hamano <junkio@cox.net>
Date: Wed, 07 Feb 2007 20:37:39 GMT
Subject: Re: git rebase: unexpected conflict
Message-ID: <7vabzp7lgs.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070207203133.GG12140@mellanox.co.il>

"Michael S. Tsirkin" <mst@mellanox.co.il> writes:

>> Since git-rebase currently ignores merge commits
>
> Ugh. This is the bit I did not know about.
>
> So the following script is kind of equivalent to rebase -
> it applies commits in range $1..$2 that touch files in list on top of current tree:
>
> from=$1
> shift
> to=$1
> shift
> git-show --pretty=email `git-rev-list --no-merges $from..$to -- $* | tac` > box
> ../git-am box
>
> And here I was hoping rebase will be smarter and help me out.
>
> OK.
>
> Questions about the above line now:
>
> 1. What is annoying in the above is that
> git-show can not limit its output to just the part of patch
> that affects the list of files I give, the way git-diff can.
> Would such an extension be a good idea?

It is a good idea and I think it is implemented.

	$ git-show <commit>... --- <paths>

would probably give what you want (although I am not absolutely
sure I understand what you want).

> 2. It's unfortunate that I need a temp file here.
> Can git-am get stdin somehow?

See "git-rebase.sh" around ll.325.