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>
J. Bruce Fields committed
Aug 5, 2007 at 17:18 UTC
0eb4f7cdf85273c88feb95c677a808cee9cfd859
1 file changed
+9
-14
Documentation/user-manual.txt
+9
-14
@@ -1,4 +1,4 @@
1
-Git User's Manual (for version 1.5.1 or newer)
1
+Git User's Manual (for version 1.5.3 or newer)
2
______________________________________________
3
4
@@ -1667,24 +1667,19 @@ one step:
1667
$ git pull origin master
1668
-------------------------------------------------
1669
1670
-In fact, "origin" is normally the default repository to pull from,
1671
-and the default branch is normally the HEAD of the remote repository,
1672
-so often you can accomplish the above with just
1670
+In fact, if you have "master" checked out, then by default "git pull"
1671
+merges from the HEAD branch of the origin repository. So often you can
1672
+accomplish the above with just a simple
1673
1674
-------------------------------------------------
1675
$ git pull
1676
-------------------------------------------------
1677
1678
-See the descriptions of the branch.<name>.remote and branch.<name>.merge
1679
-options in gitlink:git-config[1] to learn how to control these defaults
1680
-depending on the current branch. Also note that the --track option to
1681
-gitlink:git-branch[1] and gitlink:git-checkout[1] can be used to
1682
-automatically set the default remote branch to pull from at the time
1683
-that a branch is created:
1684
-
1685
--------------------------------------------------
1686
-$ git checkout --track -b maint origin/maint
1687
--------------------------------------------------
1678
+More generally, a branch that is created from a remote branch will pull
1679
+by default from that branch. See the descriptions of the
1680
+branch.<name>.remote and branch.<name>.merge options in
1681
+gitlink:git-config[1], and the discussion of the --track option in
1682
+gitlink:git-checkout[1], to learn how to control these defaults.
1683
1684
In addition to saving you keystrokes, "git pull" also helps you by
1685
producing a default commit message documenting the branch and