repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'fg/autocrlf' into next
2010-05-20
Bert Wesarg
diff: fix col
o
ring of extended diff headers
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-07
Be
r
t W
e
sa
r
g
u
nset GRE
P
_
OPTIONS in test-lib
.
sh
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert
Wes
a
r
g
merge-file: add option to
s
elect union merge
favo
r
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
merge-file: add option
to speci
f
y the
marker size
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Ber
t
Wes
a
r
g
refactor merge flags into x
m
param_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
make union m
e
rge an xdl merge fav
o
r
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Be
r
t Wesar
g
rerere: fix memory leak if r
e
rere images c
a
n't be read
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Be
r
t Wesarg
Docume
n
t
a
tion: mention conflict marker s
i
ze argument
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Ber
t
We
s
arg
get_ref
_
state
s
: strdup entries and free u
t
il in stal
e
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
B
ert We
s
arg
Give the h
u
nk comment its own colo
r
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Bert W
e
sarg
githo
o
ks
.
txt: put hoo
k
s i
n
t
o subsec
t
ions
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
B
ert Wesarg
builtin-remote: (get_one_e
n
try): use strbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
rev-parse: --a
b
b
r
ev-ref opt
i
on to shorten ref name
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Be
r
t Wesarg
for-e
a
ch-ref: uti
l
iz
e
cor
e
.
warnAm
b
ig
u
ousRefs
fo
r
:short
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Be
r
t
W
e
sarg
shorten_u
n
a
mbiguous_ref
(
): add strict mode
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
Bert W
e
sarg
f
o
r
-each
-
ref: `:short` f
o
rmat fo
r
`refname`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree