Merge branch 'sh/pull-rebase-preserve'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Sep 2013 21:57:49 +0000 (14:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Sep 2013 21:57:49 +0000 (14:57 -0700)
commit6026f68...52b6f220ce12c161fe8ac3e44a1b5b5a
tree80c9ed8...435b42a3552d20837864111a0ac36a75copy hash to clipboard (tree)
parent2de0f39...d27d8ab8eae2e3430b81294f26252693copy hash to clipboard (diff)
parent66713ef...b00933755cdeff1ae823dda7b5843640copy hash to clipboard (diff)
Documentation/config.txt