projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 48050fb fa23348)
Merge branch 'jc/mention-tracking-for-pull-default' master
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Feb 2013 00:05:02 +0000 (16:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Feb 2013 00:05:03 +0000 (16:05 -0800)
commit20a599e2c18dd5b491257d7f8aeb2d2f02221595
tree64c0199f2293bff2d4034809b5b50e9637cdd8e6tree | snapshot
parent48050fbe15a7266fffcf06c44288761217bb74ddcommit | diff
parentfa23348e95a3a98ca42a4b74e8f17fb52b95ded8commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
Git—the stupid content tracker