repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/no-textconv-symlink' into maint
2010-10-13
Bert Wesarg
Documentation: update-index
:
-z appl
i
es
also to --index
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-05-20
Bert W
e
sa
r
g
diff: fix
c
olori
n
g of extended diff headers
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-07
Bert Wesarg
unset GREP_
O
PTIONS in te
s
t-l
i
b
.
sh
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
mer
g
e
-fil
e
:
a
d
d
option to
s
e
lect
union
m
erge fa
v
or
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
merge-file: add
option to
s
pecify the marker s
i
ze
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Be
r
t
W
esarg
refactor merge flags int
o
xmpar
a
m_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
ma
k
e
u
nion merge
a
n xdl merge fa
v
or
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert Wes
a
rg
r
e
rere: fix memory leak if rerere images can't be
r
ead
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert Wesarg
Document
a
tion: me
n
tion conflict marker siz
e
argument
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
B
e
r
t
We
s
arg
get_ref_states: strdup entries
a
nd free util i
n
s
t
a
l
e
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Bert Wesarg
G
iv
e
the
h
unk
comme
n
t its own color
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
B
ert Wesarg
githooks
.
txt: put h
o
oks i
n
to subsecti
o
ns
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
B
ert
W
es
a
rg
built
i
n-re
m
o
t
e: (
g
e
t
_on
e
_e
n
try):
use strbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
r
ev-parse: --abb
r
ev-ref
o
ption to shorten ref
n
a
me
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
for-e
a
ch-ref
:
u
ti
l
ize
cor
e
.
w
a
rnAm
b
ig
u
o
usR
e
fs for :s
h
o
rt
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
sho
r
te
n
_unam
b
ig
u
ous_ref(): add strict mode
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
B
e
r
t
Wesarg
for-each
-
ref: `:s
h
o
rt
`
format for
`
r
e
fna
m
e`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree