Merge branch 'ja/fetch-doc' into maint
commitf411c43e8a5102c093681edec3e8a4c5992ac06b
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:38:18 +0000 (15 16:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:38:18 +0000 (15 16:38 -0800)
treeceb9eb998f1313da203d77894eed990c292ffaec
parent077f3d405a4d366456c82fb9a09abef06edcb88d
parent7c85d27429784c181ca633fb1465a9c651dbce8a
Merge branch 'ja/fetch-doc' into maint

* ja/fetch-doc:
  Documentation/merge-options.txt: order options in alphabetical groups
  Documentation/git-pull.txt: Add subtitles above included option files
  Documentation/fetch-options.txt: order options alphabetically
Documentation/git-pull.txt