Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e
PATCH 1/1 Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e
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.
.gitignore | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
.gitignore +0 -3
@@ -45,6 +45,3 @@ series # cscope files cscope.* - -*.orig -*.rej
Cheers
Signature · 4 lines
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!
Quoted 5 lines · S.Çağlar Onur
With
3f1b0e1f287547903f11fa1e6de7d2765597766eLinus'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.
*.orig are generated even if line numbers change a bit, so untrusted is a somewhat exaggerated.
Quoted 9 lines
.gitignore +0
-3@@ -45,6 +45,3 @@ series # cscope files cscope.* - -*.orig -*.rej
Hi;
18 Tem 2007 Çar tarihinde, Alexey Dobriyan şunları yazmıştı:
Quoted 2 lines
*.orig are generated even if line numbers change a bit, so untrusted is a somewhat exaggerated.
:), although i prefer previous one, what about something like following?
With 3f1b0e1f287547903f11fa1e6de7d2765597766e Linus's current git tree starts to ignore any *.rej files (for example "git status" cannot show what are they) but if there are some *.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 this.
.gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
.gitignore +0 -1
@@ -47,4 +47,3 @@ series cscope.* *.orig -*.rej
Cheers
Signature · 4 lines
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!
Quoted 10 lines · Alexey Dobriyan
Quoted 5 lines · S.Çağlar Onur
With
3f1b0e1f287547903f11fa1e6de7d2765597766eLinus'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.*.orig are generated even if line numbers change a bit, so untrusted is a somewhat exaggerated.
So use --no-backup-if-mismatch (IIRC).
Quoted 9 lines
.gitignore series · line 50
Quoted 9 lines
.gitignore +0
-3@@ -45,6 +45,3 @@ series # cscope files cscope.* - -*.orig -*.rej
Ok to me.
Jan