From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH] gitignore: Don't ignore *.rej Date: Wed, 12 Aug 2015 10:31:25 -0400 Message-ID: <20150812143125.GG17002@l.oracle.com> References: <1439370457-20675-1-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1439370457-20675-1-git-send-email-ian.campbell@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: Daniel Kiper , ian.jackson@eu.citrix.com, jbeulich@suse.com, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Wed, Aug 12, 2015 at 10:07:37AM +0100, Ian Campbell wrote: > These indicate a patch application went wrong, I want to see them in > "git status". This appears to have been imported from .hgignore where > it has been since 2005. > > Signed-off-by: Ian Campbell > Cc: Daniel Kiper Reviewed-by: Konrad Rzeszutek Wilk > --- > Spotted while accidentally reviewing Daniel's patch against grub's > .gitignore. > --- > .gitignore | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/.gitignore b/.gitignore > index bccbd12..dafa3c4 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -1,6 +1,5 @@ > .hg > *.orig > -*.rej > *~ > *.swp > *.o > -- > 2.1.4 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel