Code

modernize fetch/merge/pull examples
authorClemens Buchacher <drizzd@aon.at>
Wed, 21 Oct 2009 17:21:23 +0000 (19:21 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Oct 2009 21:20:50 +0000 (14:20 -0700)
commitd504f6975d34025ed3b5478b657789410b52cdb1
tree15a1740788917b9242b65a911f312edfbeaf8e5a
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0
modernize fetch/merge/pull examples

The "git pull" documentation has examples which follow an outdated
style. Update the examples to use "git merge" where appropriate and
move the examples to the corresponding manpages.

Furthermore,

 - show that pull is equivalent to fetch and merge, which is still a
   frequently asked question,

 - explain the default fetch refspec.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-fetch.txt
Documentation/git-merge.txt
Documentation/git-pull.txt