[PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

[PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

[S.Çağlar Onur]

[-- 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 --]

Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

[Alexey Dobriyan]

On Wed, Jul 18, 2007 at 09:03:13PM +0300, S.Çağlar Onur wrote:
> 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.

*.orig are generated even if line numbers change a bit, so untrusted is
a somewhat exaggerated.

> --- a/.gitignore
> +++ b/.gitignore
> @@ -45,6 +45,3 @@ series
>  
>  # cscope files
>  cscope.*
> -
> -*.orig
> -*.rej

Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

[S.Çağlar Onur]

Hi;

18 Tem 2007 Çar tarihinde, Alexey Dobriyan şunları yazmıştı: 
> *.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.

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

diff --git a/.gitignore b/.gitignore
index 8d15830..e3a56e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,4 +47,3 @@ series
 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!

Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

[Jan Engelhardt]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 802 bytes --]


On Jul 18 2007 22:52, Alexey Dobriyan wrote:
>
>On Wed, Jul 18, 2007 at 09:03:13PM +0300, S.Çağlar Onur wrote:
>> 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.
>
>*.orig are generated even if line numbers change a bit, so untrusted is
>a somewhat exaggerated.

So use --no-backup-if-mismatch (IIRC).

>> --- a/.gitignore
>> +++ b/.gitignore
>> @@ -45,6 +45,3 @@ series
>>  
>>  # cscope files
>>  cscope.*
>> -
>> -*.orig
>> -*.rej

Ok to me.


	Jan
--