"Michael S. Tsirkin" <mst@xxxxxxxxxxxxxx> 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. - 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