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-recursive: move the global obuf to struct merge_options
2008-08-23
Da
n
Hensg
e
n
g
it-mer
g
e
documenta
t
io
n
: more det
a
il
s
about resolving
.
.
.
Signed-off-by:
Dan Hensgen
<dan@methodhead.com>
commit
|
commitdiff
|
tree