repo.or.cz
/
git
/
jnareb-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 'bs/userdiff-php'
2010-05-20
Bert W
e
sarg
diff:
f
i
x coloring of extended
d
iff headers
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-07
B
ert Wesarg
unse
t
GREP_OPTIONS in te
s
t-lib
.
sh
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Be
r
t Wesarg
merge-file:
add option to
select union merge f
a
vor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert We
s
a
r
g
merg
e
-file: add option to
s
pecify
t
h
e
marker si
z
e
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Ber
t
Wesarg
r
efactor merge flags into xmpa
r
am_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
make uni
o
n merge an
x
dl merge
favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert W
e
sarg
rer
e
r
e: fix memory
leak if rerere ima
g
es can
'
t be read
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
B
e
r
t Wesarg
Documentation: ment
i
on conflic
t
marker si
z
e argume
n
t
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesarg
get_ref_s
t
a
te
s
:
s
trdup e
n
tries and
f
ree uti
l
in s
t
ale
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Bert Wesarg
Give the hunk comment it
s
ow
n
co
l
or
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Bert Wesarg
githooks
.
tx
t
:
p
ut hooks into
s
ubs
e
ctions
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
Bert Wesarg
builti
n
-remote
:
(g
e
t_one_en
t
ry):
u
se s
t
rbu
f
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert W
e
sarg
rev-par
s
e: --
a
b
b
rev-re
f
o
p
tion to shorten ref name
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
for-each-
r
ef
:
utilize c
o
r
e
.
warnA
m
biguo
u
sRefs
f
or :short
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
shorten_unam
b
iguous
_
ref()
:
a
d
d
strict
mod
e
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
Bert Wesarg
for-
e
ach
-
re
f
: `:short`
format for `r
e
f
n
a
me
`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree