Merge branch 'master' into next
commit8ebcb706c4adb788726ba045853b11a9817ac4d4
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 00:39:43 +0000 (14 17:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 00:39:43 +0000 (14 17:39 -0700)
tree9fe3e56d453647ea656e8dd422ed593a5ff927cb
parentb6b16ad115a8dc21f20e03892b9648123f445b38
parenta35138af75070adb32cf281a56186c9343af36a4
Merge branch 'master' into next

* master:
  smart-http: Really never use Expect: 100-continue
  Documentation: "rebase <onto> <that>" stays on <that> branch upon exit
  object.h: Remove obsolete struct object_refs
Documentation/git-rebase.txt