Merge branch 'po/everyday-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2014 21:16:42 +0000 (14:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2014 21:16:42 +0000 (14:16 -0700)
"git help everyday" to show the Everyday Git document.

* po/everyday-doc:
doc: add 'everyday' to 'git help'
doc: Makefile regularise OBSOLETE_HTML list building
doc: modernise everyday.txt wording and format in man page style

1  2 
Documentation/git-push.txt
Documentation/git.txt
Simple merge
Simple merge