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 'fl/askpass'
2010-03-07
Bert Wesarg
unset GREP_OP
T
IONS in test-lib
.
sh
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert
W
esar
g
m
er
g
e-file: add option t
o
select u
n
ion merge favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
B
er
t
Wesarg
mer
g
e-file: ad
d
o
p
t
ion to specify the marker size
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
refactor merg
e
fla
g
s into
x
mparam_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
make un
i
on merge an xdl mer
g
e f
a
vor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert Wesarg
rere
r
e: fix memory leak
if r
e
rere
i
m
ages can't b
e
read
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
B
e
r
t Wesarg
Documentat
i
o
n: mention confl
i
ct marker size ar
g
u
m
e
n
t
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesarg
get_r
e
f_states
:
s
trdup entries a
n
d f
r
ee util
i
n st
a
le
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Bert Wes
a
rg
Give
t
he hunk comment its ow
n
color
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Bert Wesarg
g
i
thooks
.
t
xt:
p
ut hooks i
n
to subsections
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
B
ert
We
s
arg
builti
n
-
r
em
o
te
:
(get
_
one_entry): use strbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
rev-
p
arse: --abbrev-r
e
f option t
o
sho
r
ten
ref na
m
e
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
B
ert Wesarg
for-each-r
e
f: utilize
cor
e
.
warnAmbiguo
u
sR
e
f
s
fo
r
:
s
hor
t
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
shor
t
en
_
unambiguous
_
ref
(
): add strict mode
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
Bert Wes
a
rg
for-each-ref: `:sho
r
t` f
o
rma
t
for
`refna
m
e`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree