diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-19 14:04:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-19 14:04:03 -0700 |
| commit | 3c27de63e121444e76e7178a4f5bdc73cfccb416 (patch) | |
| tree | f073f5bb8d4ec01b8db8d5b301dff4b597be725d /user-manual.html | |
| parent | 91a411f3c81ee50b7d9a6476828a238397f5456a (diff) | |
| download | git-htmldocs-3c27de63e121444e76e7178a4f5bdc73cfccb416.tar.gz | |
Autogenerated HTML docs for v2.32.0-349-gdaab8
Diffstat (limited to 'user-manual.html')
| -rw-r--r-- | user-manual.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user-manual.html b/user-manual.html index 676562d3d..2a9427231 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1206,7 +1206,7 @@ commit. Git calls this process a <a class="link" href="#fast-forwards" title="F \ o--o--o <-- new head of the branch</pre><p>In some cases it is possible that the new head will <span class="strong"><strong>not</strong></span> actually be a descendant of the old head. For example, the developer may have -realized she made a serious mistake, and decided to backtrack, +realized a serious mistake was made and decided to backtrack, resulting in a situation like:</p><pre class="literallayout"> o--o--o--o--a--b <-- old head of the branch \ o--o--o <-- new head of the branch</pre><p>In this case, <code class="literal">git fetch</code> will fail, and print out a warning.</p><p>In that case, you can still force Git to update to the new head, as |