Code

Merge branch 'ja/fetch-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:38:18 +0000 (16:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:38:18 +0000 (16:38 -0800)
* 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

1  2 
Documentation/git-pull.txt

Simple merge