Messages in this thread Patch in this message | | | From | Yunlong Song <> | Subject | [PATCH] f2fs-tools: do not ignore *.rej in git | Date | Wed, 30 May 2018 15:10:49 +0800 |
| |
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.song@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
| |