repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Don't expand CRLFs when normalizing text during merge
2010-07-02
Ey
v
ind Bernhardsen
Do
n
'
t
expand CRLFs when normalizing text d
u
ring m
e
rge
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvin
d
Bernhardsen
T
r
y no
r
mal
i
zing f
i
les to avoid
delete/
m
odify conflic
t
s
.
.
.
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2010-07-02
Eyvind
Bern
h
a
r
dsen
A
v
o
id co
n
flic
t
s wh
e
n
m
erging br
a
nches with
m
ixed norm
a
lization
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2010-06-07
Eyvind Bern
h
ard
s
e
n
Add "
c
ore
.
e
o
l
" config v
a
riab
l
e
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Ey
v
ind
B
ernhardsen
Re
n
a
m
e
th
e
"crlf" attribute "t
e
xt"
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Eyvind Bern
h
ardsen
Add p
e
r
-
r
e
pository eol nor
m
alization
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Eyvin
d
Ber
n
hard
s
en
Add
t
ests for per-repository eol no
r
ma
l
i
zation
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2008-03-23
Eyv
i
nd Bernhar
d
sen
fast-import: Docu
m
ent the effect
of "merge" with
n
o
.
.
.
Signed-off-by:
Eyvind Bernhardsen
<eyvind-git@orakel.ntnu.no>
commit
|
commitdiff
|
tree
2008-03-16
Eyvind Bern
h
ard
s
en
fast-im
p
ort: Allow "res
e
t" to delete a new
branch wi
t
hout
.
.
.
Signed-off-by:
Eyvind Bernhardsen
<eyvind-git@orakel.ntnu.no>
commit
|
commitdiff
|
tree
2007-12-10
Eyvind Bernhardsen
Fix mis
-
markup of the -p, -
-
patch op
t
i
on
i
n git-add(1)
Signed-off-by:
Eyvind Bernhardsen
<eyvind-git@orakel.ntnu.no>
commit
|
commitdiff
|
tree