projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cae7151
f08aa01
)
Merge branch 'sb/maint-octopus' into maint
author
Junio C Hamano
<gitster@pobox.com>
Wed, 20 Jan 2010 21:02:24 +0000
(13:02 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 20 Jan 2010 21:02:24 +0000
(13:02 -0800)
* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
Conflicts:
git-merge-octopus.sh
Trivial merge
projects / git.git / commitdiff