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
Merge branch 'maint-1.7.2' into maint
2010-10-13
Bert Wesarg
Documen
t
ation:
u
pd
a
te-index: -z
a
ppli
e
s also to --
i
ndex
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-05-20
Bert Wesarg
diff: fix coloring of extended diff header
s
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-07
Bert W
e
sarg
unset GR
E
P_OPT
I
ONS in test-lib
.
sh
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert
Wesarg
m
erge-fi
l
e: add
o
ptio
n
to select unio
n
merge favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
B
e
rt Wesarg
merge-f
i
le: add option to
s
pecif
y
t
h
e mar
k
er size
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
refactor merge flag
s
into xmpa
r
am
_
t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert
Wesa
r
g
m
a
ke
un
i
on merge an xdl merge
favo
r
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
B
ert
W
es
a
rg
rerere: f
i
x memory leak i
f
rerere images can't
be
r
ead
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert
W
esar
g
D
o
cu
m
en
t
at
i
on: menti
o
n co
n
f
lict marker s
i
ze argument
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Bert W
e
s
a
r
g
get_ref_st
a
t
es:
s
trdup
entr
i
es and free util in stale
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Be
r
t Wesarg
Give the
hunk comment its own co
l
or
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Bert We
s
arg
githooks
.
t
x
t: put hook
s
into subsections
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
Ber
t
Wesa
r
g
builtin
-
r
e
m
o
te: (get_o
n
e_entr
y
): use strbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
B
er
t
Wes
a
rg
rev-parse:
-
-abb
r
ev-ref opti
o
n to
shorten
ref n
a
me
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
for
-
each
-
r
e
f: uti
l
ize core
.
w
a
rnAmbi
g
uousRefs for :s
h
o
r
t
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
shorten_unambiguous_r
e
f(): add strict m
o
de
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
Bert Wesarg
for-
e
ach-
r
ef
:
`:short` forma
t
f
o
r `refname`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree