When using git apply --reject to resolve the conflicts, we should better see all the *.rej clear, or we will miss merging some *.rej patches.
Signed-off-by: Yunlong Song <yunlong.s...@huawei.com> --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3f04e85..391c528 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ *.mod.c *.lst *.orig -*.rej CVS !.gitignore -- 1.8.5.2 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
