summaryrefslogtreecommitdiff
path: root/po/git.pot
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-18 16:05:02 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-18 16:05:03 -0800
commit20a599e2c18dd5b491257d7f8aeb2d2f02221595 (patch)
tree64c0199f2293bff2d4034809b5b50e9637cdd8e6 /po/git.pot
parent48050fbe15a7266fffcf06c44288761217bb74dd (diff)
parentfa23348e95a3a98ca42a4b74e8f17fb52b95ded8 (diff)
downloadgit-20a599e2c18dd5b491257d7f8aeb2d2f02221595.tar.gz
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 'po/git.pot')
0 files changed, 0 insertions, 0 deletions