diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:48:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:48:38 -0700 |
| commit | d75148af8e54fe1d655796c75a601e5f79804808 (patch) | |
| tree | 1aed2433cb2e2d7db853a72387f48ec081ce01dc /git-push.txt | |
| parent | 624dd4c072be7e13e57519eb729f35089386fec9 (diff) | |
| download | git-htmldocs-d75148af8e54fe1d655796c75a601e5f79804808.tar.gz | |
Autogenerated HTML docs for v1.9.1-506-g7bf27
Diffstat (limited to 'git-push.txt')
| -rw-r--r-- | git-push.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-push.txt b/git-push.txt index 14862fb20..21cd45550 100644 --- a/git-push.txt +++ b/git-push.txt @@ -385,7 +385,7 @@ will now start building on top of B. The command by default does not allow an update that is not a fast-forward to prevent such loss of history. -If you do not want to lose your work (history from X to B) nor the work by +If you do not want to lose your work (history from X to B) or the work by the other person (history from X to A), you would need to first fetch the history from the repository, create a history that contains changes done by both parties, and push the result back. |