repo.or.cz
/
git
/
ericb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with 1.7.0.4
2010-03-07
B
e
r
t
Wesarg
u
n
se
t
GREP_O
P
TIONS in tes
t
-lib
.
s
h
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
merge-fil
e
: add option t
o
select
u
n
i
on merge fav
o
r
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert We
s
a
rg
merge-file:
add
opt
i
on
t
o
specify
t
he marker size
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
ref
a
ctor me
r
ge fla
g
s
into xmparam_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
make union m
e
rge an x
d
l merge favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert
W
esarg
rerere: fix memo
r
y
leak if rerere images
c
a
n't
b
e read
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert Wesarg
D
o
cu
m
entati
o
n: men
t
ion conflict marker size
a
rgument
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Ber
t
W
esar
g
get_
r
e
f_sta
t
es:
strdup ent
r
ies and
f
ree util
i
n stale
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Be
r
t
Wesarg
Give th
e
hunk
c
omment its
own c
o
lor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Bert Wesar
g
githoo
k
s
.
txt:
p
ut hooks
int
o
subsections
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
B
ert Wesarg
builtin-remote: (ge
t
_one_ent
r
y
):
u
se strbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesa
r
g
r
ev-parse: --abbrev-ref opt
i
o
n to sho
r
ten ref name
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
for-e
a
c
h-ref: ut
i
lize core
.
war
n
AmbiguousRefs for :sh
o
rt
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesa
r
g
shorten_unambiguous_
r
e
f
(): add s
t
rict
m
o
de
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
Bert W
e
sarg
for
-
each-r
e
f: `:short
`
format for `refname`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree