2018-05-30 07:11:53

by Yunlong Song

[permalink] [raw]

Subject: [PATCH] f2fs-tools: do not ignore *.rej in git

---

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 <[email protected]>
---
.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

2018-05-30 14:35:49

by Chao Yu

[permalink] [raw]

Subject: Re: [PATCH] f2fs-tools: do not ignore *.rej in git

---

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 <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

Thanks,

2018-05-30 18:23:02

by Pavel Machek

[permalink] [raw]

Subject: Re: [PATCH] f2fs-tools: do not ignore *.rej in git

---

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 <[email protected]>
> ---
> .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

---

Attachments:

(No filename) (758.00 B)
signature.asc (188.00 B)
Digital signature Download all attachments