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-file: add option to select union merge favor
2010-03-03
Be
r
t Wesarg
merge
-
file: add op
t
ion to select u
n
ion merge favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wes
a
r
g
merge-file: a
d
d
option to specify t
h
e marker size
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
B
e
r
t Wes
a
rg
refact
o
r merge fl
a
gs
into xm
p
aram_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesar
g
make union m
e
rge an xd
l
m
e
rge
f
avor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesarg
g
e
t_r
e
f_states: str
d
up entries
an
d
free util in stale
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Bert Wesarg
G
iv
e
the hunk comment its own color
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Bert Wesarg
g
ithooks
.
txt: p
u
t hooks
into su
b
sect
i
ons
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
Bert Wes
a
rg
builtin-remote: (get_
o
ne_entry): use strbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert W
e
sarg
rev-parse:
--abbrev-ref option
to shorten re
f
na
m
e
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesa
r
g
f
o
r-each-re
f
: utilize cor
e
.
warnAmbiguousRefs for
:
sh
o
rt
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
shorten_unambiguous_ref(): add strict mod
e
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
B
e
rt
Wesarg
f
o
r
-
e
a
ch-ref: `:s
h
ort
`
fo
r
mat for `refname`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree