Matthieu Moy <Matthieu.Moy@xxxxxxx> writes: > This version should address all the comments from Junio, except that I > went for my simple one-argument test_push_failure (we don't need the > complex one for now, and I'm not sure the complex one will be good > enough when we want to test 'matching'---for example, we may want to > parse the output of 'git push'). Fine by me, and the result looks good. I'll queue everything before the final one, with a single readability update (attached below) on top, on mm/simple-push topic. And then the final one will be queued on a separate mm/push/default-switch-warning topic that is forked from the former. Thanks for working on this. With acks from others I'm hoping that we can merge the "simple" to 'next' soonish. -- >8 -- Subject: [PATCH] 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@xxxxxxxxx> --- Documentation/config.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index f724fc6..6a4c130 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 -- 1.7.10.433.g8de07 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html