From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753754AbeE3Oep (ORCPT ); Wed, 30 May 2018 10:34:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:39494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753454AbeE3Oem (ORCPT ); Wed, 30 May 2018 10:34:42 -0400 Subject: Re: [PATCH] f2fs-tools: do not ignore *.rej in git To: Yunlong Song , 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 References: <1527664249-147982-1-git-send-email-yunlong.song@huawei.com> From: Chao Yu Message-ID: <1ace47d8-14ac-152a-fbcc-83a8cbe793f1@kernel.org> Date: Wed, 30 May 2018 22:34:08 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <1527664249-147982-1-git-send-email-yunlong.song@huawei.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Chao Yu Thanks,