diff options
author | J. Bruce Fields <bfields@fieldses.org> | 2006-11-25 22:45:02 -0500 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-11-25 22:46:35 -0800 |
commit | 93ee7823c0a48b7a51ac0e145b5bcc450c805ea4 (patch) | |
tree | 1bbf46e3f5ab498fa6e448dcab5ec4a66567d5cd /describe.c | |
parent | efe4631def181d32f932672a7ea31e52ee0ab308 (diff) | |
download | git-93ee7823c0a48b7a51ac0e145b5bcc450c805ea4.tar.gz git-93ee7823c0a48b7a51ac0e145b5bcc450c805ea4.tar.xz |
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>
Diffstat (limited to 'describe.c')
0 files changed, 0 insertions, 0 deletions