summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-24 12:21:12 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-24 15:22:17 -0700
commitf4d80d2639f8ef55c99c3b035c0312969acc7f01 (patch)
treee67fec21dcfa55a9911f94d6c03ae144e8e13f07 /mergetools
parent67804c2731f9028ac246f7cea6fd9652386bab33 (diff)
downloadgit-f4d80d2639f8ef55c99c3b035c0312969acc7f01.tar.gz
push.default doc: explain simple after upstream
As the "simple" mode is described in terms of what "upstream" does, swap the order of these two entries so that the reader sees "upstream" first and then reads "simple" with the knowledge of what "upstream" does. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions