projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/config.txt
Simple merge
Git—the stupid content tracker