repo.or.cz
/
git
/
kirr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'dm/mergetool-vimdiff'
2010-10-13
Bert W
e
sarg
Do
c
umentation: update-in
d
e
x: -z appl
i
es
a
lso to --index
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-05-20
Bert W
e
s
a
rg
diff: f
i
x coloring of e
x
tende
d
diff headers
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-07
Bert Wesarg
unset GRE
P
_OPTIONS i
n
test-lib
.
sh
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
m
e
rge-
f
ile: add o
p
tion to s
e
lect
union me
r
ge
favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
merge-
f
ile: add op
t
ion to specify
t
h
e mark
e
r si
z
e
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert
W
esarg
refact
o
r merge flags into xmp
a
ram_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Be
r
t
Wesarg
m
ake u
n
ion
merge
a
n xdl
m
erge favo
r
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert Wesarg
rerere: fix memory leak if rere
r
e images can't be read
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert
Wesarg
Docu
m
ent
a
tion
:
ment
i
o
n
c
onflict marke
r
size argument
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Bert
W
es
a
rg
ge
t
_ref_
s
t
a
t
e
s: st
r
dup entri
e
s and free
u
ti
l
i
n stale
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
B
e
rt
W
esarg
Give
the
h
un
k
comm
e
nt
i
ts ow
n
color
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Be
r
t Wes
a
rg
githooks
.
txt: put hooks into subs
e
ctio
n
s
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
Bert Wesa
r
g
buil
t
in-remote: (get_one_entry
)
:
u
se strbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
rev-parse: --
a
bbrev-ref option to shor
t
en ref name
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
for-ea
c
h-ref:
u
tilize core
.
warnAmbiguousRefs for :
s
hort
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert
Wesarg
shorten_unambiguou
s
_ref(): a
d
d
s
t
rict mod
e
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
B
e
rt Wesarg
for-eac
h
-r
e
f
: `:short` format for `
r
efname`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree