projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 923642f) | patch
user-manual: fix inconsistent use of pull and merge
authorJ. Bruce Fields <bfields@citi.umich.edu>
Sun, 11 Mar 2007 02:52:39 +0000 (21:52 -0500)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Sun, 11 Mar 2007 04:05:01 +0000 (23:05 -0500)
commitfabbd8f6ca610a570d7bfcbbfc80bb0e03247b2a
treea7f3a909000f264a885ae60215b17332f372f258tree | snapshot
parent923642fe1bdf010a1f2bef1507e17b9ee97cbf87commit | diff
user-manual: fix inconsistent use of pull and merge

I used "git pull ." instead of "git merge" here without any explanation.
Stick instead to "git merge" for now (the equivalent pull syntax is
still covered in a later chapter).

Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Documentation/user-manual.txt diff | blob | history
Git—the stupid content tracker