From: Chao Yu <chao@kernel.org>
To: Yunlong Song <yunlong.song@huawei.com>,
jaegeuk@kernel.org, yuchao0@huawei.com, yunlong.song@icloud.com
Cc: 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 22:34:08 +0800 [thread overview]
Message-ID: <1ace47d8-14ac-152a-fbcc-83a8cbe793f1@kernel.org> (raw)
In-Reply-To: <1527664249-147982-1-git-send-email-yunlong.song@huawei.com>
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,
next prev parent reply other threads:[~2018-05-30 14:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-30 7:10 [PATCH] f2fs-tools: do not ignore *.rej in git Yunlong Song
2018-05-30 14:34 ` Chao Yu [this message]
2018-05-30 18:22 ` Pavel Machek
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=1ace47d8-14ac-152a-fbcc-83a8cbe793f1@kernel.org \
--to=chao@kernel.org \
--cc=bintian.wang@huawei.com \
--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 \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).