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 <[email protected]> .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 <[email protected]> http://cekirdek.pardus.org.tr/~caglar/ Linux is like living in a teepee. No Windows, no Gates and an Apache in house!
Attachment:
signature.asc
Description: This is a digitally signed message part.
- Follow-Ups:
- Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e
- From: Alexey Dobriyan <[email protected]>
- Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e
- Prev by Date: Re: [git patches 1/2] warnings: attack valid cases spotted by warnings
- Next by Date: Re: [kvm-devel] [GIT PULL][RESEND #2] KVM Updates for 2.6.23-rc1
- Previous by thread: Increased CPU usage after upgrading to 2.6.21
- Next by thread: Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e
- Index(es):
 |