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
add basic tests for merge-tree
2010-05-20
Bert Wesarg
diff: fi
x
coloring of extende
d
dif
f
headers
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-07
B
ert Wesarg
unse
t
GREP_OPTI
O
NS in test-lib
.
sh
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Ber
t
Wesarg
merge-file: add
o
p
t
i
on to select union merge
f
a
vor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert W
e
sarg
m
erge
-
f
i
l
e
:
add option to s
p
ecify the marker
s
i
ze
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert
W
esarg
refact
o
r
m
erge flags into xmpar
a
m
_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
make union mer
g
e an xdl
m
erge
f
avor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert W
e
sarg
rerere:
f
ix memory leak if rerere images can't be read
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Be
r
t W
e
s
a
rg
Documenta
t
ion:
m
e
n
t
i
on
conflic
t
marke
r
size argument
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Be
r
t Wesarg
get_ref_sta
t
es
:
strd
u
p entr
i
es and free util
i
n sta
l
e
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Bert Wesarg
Giv
e
the hunk comment its own color
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Bert Wesarg
g
i
thooks
.
tx
t
:
put hook
s
into subsections
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
Bert Wesarg
builtin-remote: (get_o
n
e_entry): use
s
trbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Ber
t
Wesarg
rev-pa
r
se: --abb
r
ev-
r
ef opti
o
n to shorten ref
n
ame
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert
Wesarg
f
or-eac
h
-
r
e
f: u
t
iliz
e
core
.
war
n
A
m
biguousRefs f
o
r :sho
r
t
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
s
ho
r
ten_unambiguous_
r
ef()
:
add str
i
ct mode
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
Bert
Wesarg
fo
r
-each-ref: `:short` format for
`refna
m
e`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree