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 'jc/emfile'
2010-10-13
B
ert Wesarg
Docu
m
entation: up
d
ate-index: -z applies also to --index
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-05-20
Bert Wesarg
diff
:
fix
col
o
ring of extended diff hea
d
ers
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-07
Ber
t
Wesarg
un
s
et GREP_OPTI
O
NS
i
n test-li
b
.
s
h
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
merge
-
fi
l
e: add option t
o
select
u
nion merg
e
favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
merge-f
i
le: add option to specify the marker
size
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
refactor 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
m
erge
a
n xdl merge favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert Wes
a
rg
r
e
r
ere: fix memory lea
k
if rerere i
m
a
g
es c
a
n't be read
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Ber
t
Wesarg
Documentation: mention conflict mark
e
r size a
r
gument
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
B
ert Wesar
g
get_ref_s
t
a
tes: strdup entries and f
r
ee u
t
il in s
t
ale
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Bert Wesarg
Give the
h
u
nk comment
i
ts own
c
olor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Bert We
s
a
r
g
g
i
thooks
.
t
xt: pu
t
hooks in
t
o sub
s
ections
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
Bert Wesarg
builtin-remote:
(g
e
t_
o
ne_e
n
tr
y
)
:
use strbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
B
e
rt Wesarg
r
e
v-parse: --abb
r
e
v-r
e
f option to
s
horten
r
e
f
n
a
me
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert W
e
sarg
for-
e
ach-ref: ut
i
lize co
r
e
.
warnAmbiguousRefs f
o
r :short
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
B
ert Wesarg
shorten_unamb
i
guous_r
e
f
(
): add strict mode
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
B
ert W
e
sarg
f
or-each-ref: `:short` format for `refname`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree