diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:04:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:04:20 -0800 |
| commit | cd9c038ac93d65e1f3a9491e873e2d0bc5db73d6 (patch) | |
| tree | 59692b1d04f44b2dc3acbe9f96cf199ac395087f | |
| parent | 5cc5f09b7b12fa428ecdc3a082d77dc37c78fd3b (diff) | |
| parent | fa23348e95a3a98ca42a4b74e8f17fb52b95ded8 (diff) | |
| download | git-cd9c038ac93d65e1f3a9491e873e2d0bc5db73d6.tar.gz | |
Merge branch 'jc/mention-tracking-for-pull-default' into maint
* 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 dbb2faf602..e37ba94a72 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1758,7 +1758,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. |