repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jm/mailmap' into maint
2010-10-13
Bert Wesarg
Doc
u
m
entatio
n
: update-index: -z applies also to --index
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-05-20
Bert W
e
sarg
diff: fix color
i
ng of extended dif
f
headers
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-07
Bert We
s
arg
unset GREP_OP
T
IONS
i
n
test-
l
i
b
.
sh
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesa
r
g
mer
g
e-file: add option to
s
elect unio
n
merge favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
merge-file: add optio
n
to specify
the marker size
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
B
e
rt Wes
a
rg
refactor mer
g
e
flags
i
nto xmparam_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
m
a
ke union merg
e
an xdl merge f
a
v
or
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert
Wesarg
rerere: fix memory
l
eak if rerere images can't be read
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
B
e
rt Wesarg
D
ocumentation: mention conflict m
a
rker size
a
rgument
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Be
r
t Wesarg
get
_
ref_states:
s
t
rdup en
t
ries and
free util in stale
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Ber
t
Wesarg
G
ive th
e
hunk
c
omment it
s
o
w
n c
o
lor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
B
e
r
t W
e
sarg
g
i
thook
s
.
tx
t
:
put hook
s
i
nto subs
e
ctions
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
Bert Wesarg
b
u
il
t
i
n
-
remote: (get_o
n
e
_
entry):
use strbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Be
r
t
Wes
a
r
g
rev-parse:
-
-a
b
brev-ref option to shorten
ref name
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesar
g
for-each
-
ref: utilize co
r
e
.
warnAmbiguousRefs for :short
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert W
e
s
arg
s
h
orten_
u
na
m
biguous_re
f
():
add
s
trict mode
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
Bert
W
esarg
for-each-ref: `:short` format for `
r
efname`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree