diff options
| author | J. Bruce Fields <bfields@pig.linuxdev.us.dell.com> | 2007-08-05 21:18:52 (GMT) |
|---|---|---|
| committer | J. Bruce Fields <bfields@pig.linuxdev.us.dell.com> | 2007-08-05 21:29:01 (GMT) |
| commit | 0eb4f7cdf85273c88feb95c677a808cee9cfd859 (patch) | |
| tree | 6b94b2df03fd9843f3b6de1ee67dc7d4ba56c3c7 /Documentation/user-manual.txt | |
| parent | 4f8f03d6435e3e1c0d4f95d43022b81c95d6347f (diff) | |
| download | git-0eb4f7cdf85273c88feb95c677a808cee9cfd859.zip git-0eb4f7cdf85273c88feb95c677a808cee9cfd859.tar.gz git-0eb4f7cdf85273c88feb95c677a808cee9cfd859.tar.bz2 | |
user-manual: update for new default --track behavior
Update documentation to reflect the --track default.
That change seems to have happened in the 1.5.3 -rc's, so bump the "for
version x.y.z or newer" warning as well.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 0071cd0..c0820e9 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1,4 +1,4 @@ -Git User's Manual (for version 1.5.1 or newer) +Git User's Manual (for version 1.5.3 or newer) ______________________________________________ @@ -1667,24 +1667,19 @@ one step: $ git pull origin master ------------------------------------------------- -In fact, "origin" is normally the default repository to pull from, -and the default branch is normally the HEAD of the remote repository, -so often you can accomplish the above with just +In fact, if you have "master" checked out, then by default "git pull" +merges from the HEAD branch of the origin repository. So often you can +accomplish the above with just a simple ------------------------------------------------- $ git pull ------------------------------------------------- -See the descriptions of the branch.<name>.remote and branch.<name>.merge -options in gitlink:git-config[1] to learn how to control these defaults -depending on the current branch. Also note that the --track option to -gitlink:git-branch[1] and gitlink:git-checkout[1] can be used to -automatically set the default remote branch to pull from at the time -that a branch is created: - -------------------------------------------------- -$ git checkout --track -b maint origin/maint -------------------------------------------------- +More generally, a branch that is created from a remote branch will pull +by default from that branch. See the descriptions of the +branch.<name>.remote and branch.<name>.merge options in +gitlink:git-config[1], and the discussion of the --track option in +gitlink:git-checkout[1], to learn how to control these defaults. In addition to saving you keystrokes, "git pull" also helps you by producing a default commit message documenting the branch and |