diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-24 12:21:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-24 15:22:17 -0700 |
| commit | f4d80d2639f8ef55c99c3b035c0312969acc7f01 (patch) | |
| tree | e67fec21dcfa55a9911f94d6c03ae144e8e13f07 /Documentation/config.txt | |
| parent | push: document the future default change for push.default (matching -> simple) (diff) | |
| download | tgif-f4d80d2639f8ef55c99c3b035c0312969acc7f01.tar.xz | |
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>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f724fc64b2..6a4c130602 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1689,14 +1689,14 @@ push.default:: + This is currently the default, but Git 2.0 will change the default to `simple`. -* `simple` - like `upstream`, but refuses to push if the upstream - branch's name is different from the local one. This is the safest - option and is well-suited for beginners. It will become the default - in Git 2.0. * `upstream` - push the current branch to its upstream branch. With this, `git push` will update the same remote ref as the one which is merged by `git pull`, making `push` and `pull` symmetrical. See "branch.<name>.merge" for how to configure the upstream branch. +* `simple` - like `upstream`, but refuses to push if the upstream + branch's name is different from the local one. This is the safest + option and is well-suited for beginners. It will become the default + in Git 2.0. * `current` - push the current branch to a branch of the same name. + The `simple`, `current` and `upstream` modes are for those who want to |