LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Pavel Machek <pavel@ucw.cz>
To: Yunlong Song <yunlong.song@huawei.com>
Cc: jaegeuk@kernel.org, chao@kernel.org, yuchao0@huawei.com,
	yunlong.song@icloud.com, miaoxie@huawei.com,
	bintian.wang@huawei.com, shengyong1@huawei.com,
	heyunlei@huawei.com, linux-f2fs-devel@lists.sourceforge.net,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] f2fs-tools: do not ignore *.rej in git
Date: Wed, 30 May 2018 20:22:09 +0200	[thread overview]
Message-ID: <20180530182209.GA19379@amd> (raw)
In-Reply-To: <1527664249-147982-1-git-send-email-yunlong.song@huawei.com>

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

      parent reply	other threads:[~2018-05-30 18:22 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-30  7:10 Yunlong Song
2018-05-30 14:34 ` Chao Yu
2018-05-30 18:22 ` Pavel Machek [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180530182209.GA19379@amd \
    --to=pavel@ucw.cz \
    --cc=bintian.wang@huawei.com \
    --cc=chao@kernel.org \
    --cc=heyunlei@huawei.com \
    --cc=jaegeuk@kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miaoxie@huawei.com \
    --cc=shengyong1@huawei.com \
    --cc=yuchao0@huawei.com \
    --cc=yunlong.song@huawei.com \
    --cc=yunlong.song@icloud.com \
    --subject='Re: [PATCH] f2fs-tools: do not ignore *.rej in git' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).