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