![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | J. Bruce Fields <bfields@fieldses.org> | |
| Sun, 26 Nov 2006 03:45:02 +0000 (22:45 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 26 Nov 2006 06:46:35 +0000 (22:46 -0800) | ||
| commit | 93ee7823c0a48b7a51ac0e145b5bcc450c805ea4 | |
| tree | 1bbf46e3f5ab498fa6e448dcab5ec4a66567d5cd | tree | snapshot |
| parent | efe4631def181d32f932672a7ea31e52ee0ab308 | commit | diff |
Documentation: clarify tutorial pull/merge discussion
Attempt to clarify somewhat the difference between pull and merge,
and give a little more details on the pull syntax.
I'm still not happy with this section: the explanation of the origin
branch isn't great, but maybe that should be left alone pending the
use-separate-remotes change; and we need to explain how to set up a
public repository and push to it.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Attempt to clarify somewhat the difference between pull and merge,
and give a little more details on the pull syntax.
I'm still not happy with this section: the explanation of the origin
branch isn't great, but maybe that should be left alone pending the
use-separate-remotes change; and we need to explain how to set up a
public repository and push to it.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/tutorial.txt | diff | blob | history |