repo.or.cz
/
git
/
srabbelier.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Avoid conflicts when merging branches with mixed normalization
2010-07-02
Eyv
i
nd Bernhardsen
A
v
o
id
co
n
f
l
icts when merging branches with mixed normalization
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2010-06-07
Eyvind Bernhardsen
Ad
d
"core
.
eol" confi
g
v
a
ria
b
le
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
E
y
vind Bernhar
d
sen
Rena
m
e the "crlf" attribute "tex
t
"
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
E
yvind Bernhar
d
sen
Add p
e
r-repo
s
i
t
ory
eol normalization
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Eyvind
B
ernhardsen
Add
t
e
sts for per-reposi
t
ory eol
n
or
m
aliza
t
ion
Signed-off-by:
Eyvind Bernhardsen
<eyvind.bernhardsen@gmail.com>
commit
|
commitdiff
|
tree
2008-03-23
Eyvind Be
r
nh
a
r
ds
e
n
fast-import: Docum
e
nt the effect of "me
r
ge" with no
.
.
.
Signed-off-by:
Eyvind Bernhardsen
<eyvind-git@orakel.ntnu.no>
commit
|
commitdiff
|
tree
2008-03-16
Eyvi
n
d
Bernhard
s
e
n
f
a
st-import: Allow "rese
t
"
to d
e
lete a new
b
ranch without
.
.
.
Signed-off-by:
Eyvind Bernhardsen
<eyvind-git@orakel.ntnu.no>
commit
|
commitdiff
|
tree
2007-12-10
Eyvind Bernhar
d
sen
F
i
x mi
s
-markup of the -p, --patch op
t
i
on in git
-
a
dd(1)
Signed-off-by:
Eyvind Bernhardsen
<eyvind-git@orakel.ntnu.no>
commit
|
commitdiff
|
tree
