| commit | 20a599e2c18dd5b491257d7f8aeb2d2f02221595 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Feb 2013 00:05:02 +0000 (18 16:05 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Feb 2013 00:05:03 +0000 (18 16:05 -0800) | ||
| tree | 64c0199f2293bff2d4034809b5b50e9637cdd8e6 | treesnapshot (tar.gz zip) |
| parent | 48050fbe15a7266fffcf06c44288761217bb74dd | commitdiff |
| parent | fa23348e95a3a98ca42a4b74e8f17fb52b95ded8 | commitdiff |
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
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
| Documentation/config.txt | diff1 | diff2 | blobhistory |