diff options
| author |  Johan Herland <johan@herland.net> | 2013-09-08 22:58:13 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-09-09 11:03:01 -0700 |
| commit | fef0e991aa51481f047473e79a8f4d61f56dd60f (patch) | |
| tree | 5d778bb8d60d276903c7e1af260d4256f88683a9 /Documentation/git-mergetool.txt | |
| parent | t3200: Minor fix when preparing for tracking failure (diff) | |
| download | tgif-fef0e991aa51481f047473e79a8f4d61f56dd60f.tar.xz | |
Refer to branch.<name>.remote/merge when documenting --track
Make it easier for readers to find the actual config variables that
implement the "upstream" relationship.
Suggested-by: Per Cederqvist <cederp@opera.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions