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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 30 May 2018 20:22:09 +0200
From:   Pavel Machek <pavel@....cz>
To:     Yunlong Song <yunlong.song@...wei.com>
Cc:     jaegeuk@...nel.org, chao@...nel.org, yuchao0@...wei.com,
        yunlong.song@...oud.com, miaoxie@...wei.com,
        bintian.wang@...wei.com, shengyong1@...wei.com,
        heyunlei@...wei.com, linux-f2fs-devel@...ts.sourceforge.net,
        linux-kernel@...r.kernel.org
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 <yunlong.song@...wei.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

Download attachment "signature.asc" of type "application/pgp-signature" (182 bytes)