diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-29 12:53:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-02 11:21:51 -0700 |
| commit | f471dbc5feeefd3a761f311d3efa7b1a987bcb13 (patch) | |
| tree | 483554a9a64fcefe0a2add810cc13eafdfeb2182 /xdiff-interface.h | |
| parent | 366a0184e550200bf80fb76217b8655b54b1fd6c (diff) | |
| download | git-f471dbc5feeefd3a761f311d3efa7b1a987bcb13.tar.gz git-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 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions