diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-18 16:05:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-18 16:05:03 -0800 |
| commit | 20a599e2c18dd5b491257d7f8aeb2d2f02221595 (patch) | |
| tree | 64c0199f2293bff2d4034809b5b50e9637cdd8e6 | |
| parent | 48050fbe15a7266fffcf06c44288761217bb74dd (diff) | |
| parent | fa23348e95a3a98ca42a4b74e8f17fb52b95ded8 (diff) | |
| download | git-20a599e2c18dd5b491257d7f8aeb2d2f02221595.tar.gz git-20a599e2c18dd5b491257d7f8aeb2d2f02221595.tar.xz | |
Merge branch 'jc/mention-tracking-for-pull-default'
We stopped mentioning `tracking` is a deprecated but supported
synonym for `upstream` in pull.default even though we have no
intention of removing the support for it.
* jc/mention-tracking-for-pull-default:
doc: mention tracking for pull.default
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 481736a47..3bb53da52 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1811,7 +1811,8 @@ push.default:: + This is currently the default, but Git 2.0 will change the default to `simple`. -* `upstream` - push the current branch to its upstream branch. +* `upstream` - push the current branch to its upstream branch + (`tracking` is a deprecated synonym for this). 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. |