Messages in this thread | | | Date | Sun, 11 May 2008 10:24:01 +0200 | From | Sam Ravnborg <> | Subject | Re: [PATCH] Remove *.rej pattern from .gitignore |
| |
On Fri, May 02, 2008 at 02:10:08PM +0300, S.Çağlar Onur wrote: > Hi; > > With commit "3f1b0e1f287547903f11fa1e6de7d2765597766e" Linus's current git tree starts to ignore any "*.rej" files. So "git status" no longer shows these files, but the ones who works with quilt patchsets, this not makes life easier as expected. Because sometimes a work flow (at least for me) requires "quilt push -f" followed by "git status" to see unresolved merge conflicts, work on these conflicts to correct them and finalize the patch with "quilt refresh". > > And if there are some "*.rej" files exists in tree, for whatever reason, this means something goes really wrong there and i think this situation not deserves to be ignored. > > This is the second time i came across with this patch cause the first one (http://lkml.org/lkml/2007/7/18/327) ends up nowhere :) > > Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
Hi S.Çağlar.
I fixed up the changelog and apllied this to kbuild-fixes.
Sam -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |