summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-05-29 12:53:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-02 11:21:51 -0700
commitf471dbc5feeefd3a761f311d3efa7b1a987bcb13 (patch)
tree483554a9a64fcefe0a2add810cc13eafdfeb2182 /builtin
parentfetch doc: move FETCH_HEAD material lower and add an example (diff)
downloadtgif-f471dbc5feeefd3a761f311d3efa7b1a987bcb13.tar.xz
fetch doc: update note on '+' in front of the refspec
While it is not *wrong* per-se to say that pulling a rewound/rebased branch will lead to an unnecessary merge conflict, that is not what the leading "+" sign to allow non-fast-forward update of remote-tracking branch is at all. Helped-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions