]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b68365 f08aa01)
Merge branch 'sb/maint-octopus' into maint-1.6.5
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Feb 2010 08:06:11 +0000 (00:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Feb 2010 08:06:11 +0000 (00:06 -0800)
* sb/maint-octopus:
  octopus: remove dead code
  octopus: reenable fast-forward merges
  octopus: make merge process simpler to follow


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.