git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ad6f1a f08aa01)
Merge branch 'sb/maint-octopus'
authorJunio C Hamano <redacted>
Thu, 7 Jan 2010 23:40:21 +0000 (15:40 -0800)
committerJunio C Hamano <redacted>
Thu, 7 Jan 2010 23:40:21 +0000 (15:40 -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
git clone https://git.99rst.org/PROJECT