diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2006-12-31 18:47:38 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-31 16:44:41 -0800 |
| commit | d66409f068df3a8590524c3224e300194c7c8b6b (patch) | |
| tree | 0cab67c8bfe4cb957a893585e6e9500639eb6df9 /Documentation/tutorial.txt | |
| parent | f65bb2c66fbebc10810857c64466679c81bf8154 (diff) | |
| download | git-d66409f068df3a8590524c3224e300194c7c8b6b.tar.gz git-d66409f068df3a8590524c3224e300194c7c8b6b.tar.xz | |
Documentation: update tutorial's discussion of origin
Update tutorial's discussion of origin branch to reflect new defaults,
and include a brief mention of git-repo-config.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/tutorial.txt')
| -rw-r--r-- | Documentation/tutorial.txt | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index cb808d924..d043e844d 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -323,20 +323,25 @@ $ git pull Note that he doesn't need to give the path to Alice's repository; when Bob cloned Alice's repository, git stored the location of her -repository in the file .git/remotes/origin, and that location is used -as the default for pulls. - -Bob may also notice a branch in his repository that he didn't create: +repository in the repository configuration, and that location is +used for pulls: ------------------------------------- -$ git branch -* master - origin +$ git repo-config --get remote.origin.url +/home/bob/myrepo ------------------------------------- -The "origin" branch, which was created automatically by "git clone", -is a pristine copy of Alice's master branch; Bob should never commit -to it. +(The complete configuration created by git-clone is visible using +"git repo-config -l", and the gitlink:git-repo-config[1] man page +explains the meaning of each option.) + +Git also keeps a pristine copy of Alice's master branch under the +name "origin/master": + +------------------------------------- +$ git branch -r + origin/master +------------------------------------- If Bob later decides to work from a different host, he can still perform clones and pulls using the ssh protocol: |