public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "S.Çağlar Onur" <caglar@pardus.org.tr>
To: adobriyan@sw.ru
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	David Woodhouse <dwmw2@infradead.org>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e
Date: Wed, 18 Jul 2007 21:03:13 +0300	[thread overview]
Message-ID: <200707182103.13500.caglar@pardus.org.tr> (raw)

[-- Attachment #1: Type: text/plain, Size: 890 bytes --]

Hi;

With 3f1b0e1f287547903f11fa1e6de7d2765597766e Linus's current git tree starts 
to ignore any *.orig or *.rej files (for example "git status" cannot show 
what are they) but if there are some *.orig or *.rej files exists, for 
whatever reason, that means some unresolved merge conflicts occured for that 
code tree and this tree is no longer trusted so better not to ignore these.

Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
 
 .gitignore |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d15830..060a71d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,3 @@ series
 
 # cscope files
 cscope.*
-
-*.orig
-*.rej


Cheers
-- 
S.Çağlar Onur <caglar@pardus.org.tr>
http://cekirdek.pardus.org.tr/~caglar/

Linux is like living in a teepee. No Windows, no Gates and an Apache in house!

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

             reply	other threads:[~2007-07-18 18:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-18 18:03 S.Çağlar Onur [this message]
2007-07-18 18:52 ` [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e Alexey Dobriyan
2007-07-18 19:01   ` S.Çağlar Onur
2007-07-19 16:25   ` Jan Engelhardt

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=200707182103.13500.caglar@pardus.org.tr \
    --to=caglar@pardus.org.tr \
    --cc=adobriyan@sw.ru \
    --cc=akpm@linux-foundation.org \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /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