LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] f2fs-tools: do not ignore *.rej in git
@ 2018-05-30  7:10 Yunlong Song
  2018-05-30 14:34 ` Chao Yu
  2018-05-30 18:22 ` Pavel Machek
  0 siblings, 2 replies; 3+ messages in thread
From: Yunlong Song @ 2018-05-30  7:10 UTC (permalink / raw)
  To: jaegeuk, chao, yuchao0, yunlong.song, yunlong.song
  Cc: miaoxie, bintian.wang, shengyong1, heyunlei, linux-f2fs-devel,
	linux-kernel

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] f2fs-tools: do not ignore *.rej in git
  2018-05-30  7:10 [PATCH] f2fs-tools: do not ignore *.rej in git Yunlong Song
@ 2018-05-30 14:34 ` Chao Yu
  2018-05-30 18:22 ` Pavel Machek
  1 sibling, 0 replies; 3+ messages in thread
From: Chao Yu @ 2018-05-30 14:34 UTC (permalink / raw)
  To: Yunlong Song, jaegeuk, yuchao0, yunlong.song
  Cc: miaoxie, bintian.wang, shengyong1, heyunlei, linux-f2fs-devel,
	linux-kernel

On 2018/5/30 15:10, Yunlong Song wrote:
> 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>

Reviewed-by: Chao Yu <yuchao0@huawei.com>

Thanks,

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] f2fs-tools: do not ignore *.rej in git
  2018-05-30  7:10 [PATCH] f2fs-tools: do not ignore *.rej in git Yunlong Song
  2018-05-30 14:34 ` Chao Yu
@ 2018-05-30 18:22 ` Pavel Machek
  1 sibling, 0 replies; 3+ messages in thread
From: Pavel Machek @ 2018-05-30 18:22 UTC (permalink / raw)
  To: Yunlong Song
  Cc: jaegeuk, chao, yuchao0, yunlong.song, miaoxie, bintian.wang,
	shengyong1, heyunlei, linux-f2fs-devel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 758 bytes --]

On Wed 2018-05-30 15:10:49, Yunlong Song wrote:
> 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

I don't think that's good idea. You don't want .rej files version
controlled, that's what .gitignore file says.

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-05-30 18:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-30  7:10 [PATCH] f2fs-tools: do not ignore *.rej in git Yunlong Song
2018-05-30 14:34 ` Chao Yu
2018-05-30 18:22 ` Pavel Machek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).