repo.or.cz
/
alt-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/maint-branch-mergeoptions' into mg/merge-ff-config
2011-03-31
Nicolas M
o
r
ey-Cha
i
se
.
.
.
submo
d
u
l
e
:
p
rocess conflict
i
ng submodules only once
Signed-off-by:
Nicolas Morey-Chaisemartin
<nicolas@morey-chaisemartin...
commit
|
commitdiff
|
tree