Re: [ 000/103] 3.10.3-stable review

From: Willy Tarreau
Date: Wed Jul 24 2013 - 13:16:04 EST


On Wed, Jul 24, 2013 at 10:04:17AM -0700, Linus Torvalds wrote:
> The alternative workflow is to tell git to track the new files added
> by the patch. So if you use "git apply --index", git will not just
> apply the patch, it will also add the result to the index - so you
> could commit it with a single "git commit", and you can see the diff -
> including new files - with "git diff --cached". And then "git reset
> --hard" will also undo the new files.

When I test Greg's pre-releases, I tend to apply the whole mail thread
using "git am". After that I just have to manually updated the Makefile
and that's fine. When I try the merged -rc patch insted, I also use
"git apply --index" which I find convenient for this.

Willy

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/