From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756575AbZBSUZq (ORCPT ); Thu, 19 Feb 2009 15:25:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753923AbZBSUZh (ORCPT ); Thu, 19 Feb 2009 15:25:37 -0500 Received: from mail-in-17.arcor-online.net ([151.189.21.57]:44613 "EHLO mail-in-17.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753897AbZBSUZg (ORCPT ); Thu, 19 Feb 2009 15:25:36 -0500 X-DKIM: Sendmail DKIM Filter v2.6.0 mail-in-02.arcor-online.net C59063FE374 From: Bodo Eggert <7eggert@gmx.de> Subject: Re: [PATCH] Add *.rej to .gitignore To: Ingo Molnar , jeremy@goop.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, sam@ravnborg.org, gitster@pobox.com, caglar@pardus.org.tr, David Miller Reply-To: 7eggert@gmx.de Date: Thu, 19 Feb 2009 21:25:28 +0100 References: User-Agent: KNode/0.10.4 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit Message-Id: X-be10.7eggert.dyndns.org-MailScanner-Information: See www.mailscanner.info for information X-be10.7eggert.dyndns.org-MailScanner: Found to be clean X-be10.7eggert.dyndns.org-MailScanner-From: 7eggert@gmx.de Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ingo Molnar wrote: > * David Miller wrote: >> From: Jeremy Fitzhardinge >> > *.rej files really are unwanted. If there are any .rej files, they can be >> > found by some other means (perhaps git itself could warn when committing >> > with *.rej files present, or add some distinct notion of "ignored files" vs >> > "never commit" files). >> > >> > (This effectively reverts 1f5d3a6b6532e25a5cdf1f311956b2b03d343a48) >> > >> > Signed-off-by: Jeremy Fitzhardinge >> >> I don't know about this. >> >> I really want to know if there are reject files there if I am >> checking to see if my tree is clean. [...] > Well, it depends on the workflow. You are making the assumption > that everyone is using your workflow, and you are judging them > based on that false assumption. If different users need different .gitignores, you need a per-user setting. Let there be ~/.git/gitignore.