diff options
Diffstat (limited to 'Documentation')
| -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 122e3c4996..10e28560ed 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1749,7 +1749,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. |