Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp4179978imm; Wed, 30 May 2018 00:11:53 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIZ/H0MCujZvTzk8sCE9II9MqqxdWaQ9ukNwNhyRme8gsHqC124lmpQn4K6jdXeiP9khAvh X-Received: by 2002:a62:c2:: with SMTP id 185-v6mr1649825pfa.238.1527664312998; Wed, 30 May 2018 00:11:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527664312; cv=none; d=google.com; s=arc-20160816; b=Wzsi1csiWg/Ns/2KsyeivYeuaatbA6pQyMFM6TlJFZZyMCLxhUZdVW1z20ryzVgAon b7+yhe6kbwD5KQ3rVBypd3pcoWa5HV0DHJdzi1+6l9gxxxtULi79FuXg7vrKJ1XH9QpE hfrE7EYnJR8eC44bFLFgHJmaTyC66k+CnJS63fFY7dSdiRNDYxPq/Pmte8+8k4uz4b8/ GGUH4EoZT0+RIRkWz7fWCMiLxfSCaY3qcoQJNfIAdGBngRC4gV9Qlv34OycJoSLZLSZ7 YLdF3kCRpTWwKHASDTRnCZzYyTjnTNln+cPeH47O7fmUhshFfsn8AtOLdb/X8Htka1V8 wOAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=FWYHoV3/YP8K/BU6WeEJEPM3uBTmyu7OCWCuH+Fs9DI=; b=kM1G/iZDtK0hCoEnMOAAuOPKhT0z/urEDTZfAdKs5upUH3XOHctKD9dCSRaAdquU0b GABAPSrj7+QeGv9YwJKTJud/pb5svB8+ThHBivYwPvEI+riGx87bkBJczWj2jcKoIhoY PVJTnGWlk1fGCIWmCEDDxeAu9HW8XwtQu67HU8FRdjmjaFl/4WD1oILJwFsg864aLBQm EDWdJhcdgVQJrhJPEBi2YzhqCXzEYhKHcH8GWyyD5iWA54Jhfx5xrEyMP/ejdKVJF/tD sfzbOr1zkezo6qntyHrzz2HO59F844ku+m6khRtraM6EEArnausxLzdexY9jMM4L6bZG Nj8Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e26-v6si34385765pfb.185.2018.05.30.00.11.39; Wed, 30 May 2018 00:11:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968644AbeE3HLF (ORCPT + 99 others); Wed, 30 May 2018 03:11:05 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:56719 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S968533AbeE3HLD (ORCPT ); Wed, 30 May 2018 03:11:03 -0400 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 1E0F752A4B979; Wed, 30 May 2018 15:11:00 +0800 (CST) Received: from huawei.com (10.113.189.234) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.382.0; Wed, 30 May 2018 15:10:54 +0800 From: Yunlong Song To: , , , , CC: , , , , , Subject: [PATCH] f2fs-tools: do not ignore *.rej in git Date: Wed, 30 May 2018 15:10:49 +0800 Message-ID: <1527664249-147982-1-git-send-email-yunlong.song@huawei.com> X-Mailer: git-send-email 1.8.5.2 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.113.189.234] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- .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