repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cc/reset-keep'
2010-03-07
Bert
W
esarg
u
nset GREP
_
OPTIONS in test
-
lib
.
sh
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
B
ert
We
s
a
r
g
merge
-
f
ile
:
add option to select union me
r
ge favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wes
a
rg
m
erge-file: add
option to
specify the mar
k
er
s
ize
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Ber
t
Wesarg
r
efa
c
tor merge f
l
ags into
xmparam_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Be
r
t Wesarg
ma
k
e
union
m
erge an xd
l
merg
e
f
avor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Be
r
t Wesarg
rerer
e
: fix memory leak if
r
e
rere imag
e
s can't be read
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Be
r
t Wesar
g
D
o
cumentat
i
o
n: ment
i
on c
o
nfli
c
t marke
r
size ar
g
u
m
ent
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesarg
g
e
t_ref
_
sta
t
es:
strdup entries and free
util in
s
t
a
le
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
B
e
rt Wesarg
Give the h
u
nk
comment
i
t
s own c
o
lor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
B
e
rt Wesarg
githooks
.
txt: put ho
o
ks into
subsections
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
Bert
Wesa
r
g
b
u
i
ltin-remote:
(get_one_
e
ntry):
u
se str
b
uf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
B
ert
We
s
arg
rev-
p
ar
s
e: --abbrev-
r
ef 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
W
esarg
for-
e
ach-ref: u
t
i
l
ize core
.
warnAmbiguousRefs for :short
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert W
e
sarg
shorte
n
_un
a
mbiguous_ref(): add strict m
o
de
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
Bert Wesa
r
g
for-e
a
c
h
-ref: `:sho
r
t
` format
f
or
`
r
e
f
n
a
me`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree