diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-31 12:50:38 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-31 17:00:56 -0800 |
commit | fa23348e95a3a98ca42a4b74e8f17fb52b95ded8 (patch) | |
tree | c64e8bb035d96f2170555de53c3870aea640e49d /merge-recursive.h | |
parent | Git 1.7.12.4 (diff) | |
download | tgif-fa23348e95a3a98ca42a4b74e8f17fb52b95ded8.tar.xz |
doc: mention tracking for pull.default
When looking at a configuration file edited long time ago, a user
may find 'pull.default = tracking' and wonder what it means, but
earlier we stopped mentioning this value, even though the code still
support it and more importantly, we have no intention to force old
timers to update their configuration files.
Instead of not mentioning it, add it to the description in a way
that makes it clear that users have no reason to add new uses of it
preferring over 'upstream', by not listing it as a separate item on
the same footing as other values but as a deprecated synonym of the
'upstream' in its description.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions