Skip to content

Commit f4d80d2

Browse files
committed
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 <[email protected]>
1 parent 67804c2 commit f4d80d2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Documentation/config.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,14 +1689,14 @@ push.default::
16891689
+
16901690
This is currently the default, but Git 2.0 will change the default
16911691
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.
16961692
* `upstream` - push the current branch to its upstream branch.
16971693
With this, `git push` will update the same remote ref as the one which
16981694
is merged by `git pull`, making `push` and `pull` symmetrical.
16991695
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.
17001700
* `current` - push the current branch to a branch of the same name.
17011701
+
17021702
The `simple`, `current` and `upstream` modes are for those who want to

0 commit comments

Comments
 (0)