Added a few examples to git-pull man page.
authorJon Loeliger <jdl@freescale.com>
Sat, 5 Nov 2005 02:36:08 +0000 (20:36 -0600)
committerJunio C Hamano <junkio@cox.net>
Sat, 5 Nov 2005 03:28:39 +0000 (19:28 -0800)
commitbccf5956c323a043e9a5d540b3c842ae6e5e5220
treeef3876e50bb5e91a6fb40d4e59df2178c6f40237
parentd8ae1d10cd08ff1f0b749222d083446ef7bd8f3f
Added a few examples to git-pull man page.

Clarified and added notes for pull/push refspecs.
Converted to back-ticks for literal text examples.

[jc: Also fixed git-pull description that still talked about its
calling git-resolve or git-octopus (we do not anymore; instead
we just call git-merge).  BTW, I am reasonably impressed by how
well "git-am -3" applied this patch, which had some conflicts
because I've updated the documentation somewhat.]

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-pull.txt
Documentation/pull-fetch-param.txt