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 /git-merge-resolve.sh | |
| parent | Merge branch 'mm/config-intro-in-git-doc' (diff) | |
| parent | doc: mention tracking for pull.default (diff) | |
| download | tgif-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
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions