lkml.org 
[lkml]   [2018]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] f2fs-tools: do not ignore *.rej in git
Date
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
\
 
 \ /
  Last update: 2018-05-30 09:11    [W:0.162 / U:0.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site