push.default doc: explain simple after upstream
As the "simple" mode is described in terms of what "upstream" does, swap the order of these two entries so that the reader sees "upstream" first and then reads "simple" with the knowledge of what "upstream" does. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 24, 2012 at 12:21 UTC
f4d80d2639f8ef55c99c3b035c0312969acc7f01
1 file changed
+4
-4
Documentation/config.txt
+4
-4
@@ -1689,14 +1689,14 @@ push.default::
1689
+
1690
This is currently the default, but Git 2.0 will change the default
1691
to `simple`.
1692
-* `simple` - like `upstream`, but refuses to push if the upstream
1693
- branch's name is different from the local one. This is the safest
1694
- option and is well-suited for beginners. It will become the default
1695
- in Git 2.0.
1692
* `upstream` - push the current branch to its upstream branch.
1693
With this, `git push` will update the same remote ref as the one which
1694
is merged by `git pull`, making `push` and `pull` symmetrical.
1695
See "branch.<name>.merge" for how to configure the upstream branch.
1696
+* `simple` - like `upstream`, but refuses to push if the upstream
1697
+ branch's name is different from the local one. This is the safest
1698
+ option and is well-suited for beginners. It will become the default
1699
+ in Git 2.0.
1700
* `current` - push the current branch to a branch of the same name.
1701
+
1702
The `simple`, `current` and `upstream` modes are for those who want to