| commit | f471dbc5feeefd3a761f311d3efa7b1a987bcb13 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 May 2014 19:53:28 +0000 (29 12:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Jun 2014 18:21:51 +0000 (2 11:21 -0700) | ||
| tree | 483554a9a64fcefe0a2add810cc13eafdfeb2182 | treesnapshot (tar.gz zip) |
| parent | 366a0184e550200bf80fb76217b8655b54b1fd6c | commitdiff |
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>
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>
| Documentation/pull-fetch-param.txt | diffblobblamehistory |