Re: Creating diff from 2.6.16 from cryptodev-2.6 git tree

From: Linus Torvalds <torvalds@osdl.org>
Date: Jun 30, 2006, 06:20 UTC
Message-ID: <Pine.LNX.4.64.0606292316070.12404@g5.osdl.org>
In-Reply-To: <44A4BA6D.5010006@logix.cz>

On Fri, 30 Jun 2006, Michal Ludvig wrote:

Show 6 quoted lines

>
> Linus Torvalds wrote:
> 
> > 	git log -p --full-diff v2.6.16.. crypto/
> 
> Can I somehow get the result in a reverse order, i.e. oldest commits first?

Not that way, no. "git log" generates the data on-the-fly, so a simple "git log" will always give most recent first.

However, you can do this

	git log --pretty=oneline v2.6.16.. crypto/

to generate a list of commits, one per line. Then, reverse that list ("tac" is your friend), and feed it back to "git-diff-tree --stdin --pretty -p" to get the diffs.

So

	git log --pretty=oneline v2.6.16.. crypto/ |
		tac |
		git-diff-tree --stdin --pretty -p

should do what you want.

Of course, the patches (to other files than the crypt/ subdirectory) may still clash due to changes that are unrelated to the crypto changes. That is unavoidable, and you'll just have to fix that up by hand.

			Linus