repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
log --remerge-diff: show what the conflict resolution changed
2018-04-11
Thomas Rast
l
o
g --rem
e
r
g
e-diff:
s
h
ow
w
hat t
h
e
c
onfl
i
c
t
re
s
olutio
n
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Thomas Rast
nam
e
-
h
ash
:
allow
dir hashing ev
e
n when !ignore_ca
s
e
commit
|
commitdiff
|
tree
2018-04-11
T
h
o
ma
s
Rast
merge-recursive: allow storing conflict hunks in index
commit
|
commitdiff
|
tree
2018-04-11
Th
o
mas R
a
st
merge
_
di
f
f_mod
e
: fold all merge d
i
f
f variant
s
into
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Tho
m
as Rast
combi
n
e-d
i
f
f
: do no
t
pass
r
evs->dense_
c
ombi
n
e
d
_merg
e
s
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Thomas R
a
st
merg
e
-r
e
cursive
:
-Xin
d
e
x-onl
y
t
o
le
a
ve wo
r
ktree unch
a
nged
commit
|
commitdiff
|
tree
2018-04-11
Thomas
Ras
t
merge-recursiv
e
: internal flag to a
v
oid to
u
ching
the
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Thomas
R
ast
merge-recursive: rem
o
ve de
a
d
c
onditional in update_stages
(
)
commit
|
commitdiff
|
tree
