Merge branch 'ja/fetch-doc'
commitb7eb912b0d3352d43a11c79fab97cd7f92f0646e
authorJunio C Hamano <gitster@pobox.com>
Sat, 31 Oct 2009 03:05:47 +0000 (30 20:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 31 Oct 2009 03:05:47 +0000 (30 20:05 -0700)
tree0555031fb52e097495e7642a7c98be03264edd73
parent0f06f3ff76bea09a2344adacca5bfc0d637b2086
parent7c85d27429784c181ca633fb1465a9c651dbce8a
Merge branch 'ja/fetch-doc'

* 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