diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-31 23:04:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-31 23:04:31 +0000 |
| commit | 167b1384c594ba1ce67e6aae4e4c3cfb304bf025 (patch) | |
| tree | 31e32edd1f8c3544e90e2768653cffa0be026cf1 /user-manual.txt | |
| parent | 197c229dba62a22dd8e42d6fc026a00de2944081 (diff) | |
| download | git-htmldocs-167b1384c594ba1ce67e6aae4e4c3cfb304bf025.tar.gz | |
Autogenerated HTML docs for v1.7.0-rc1-7-gc0da5
Diffstat (limited to 'user-manual.txt')
| -rw-r--r-- | user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user-manual.txt b/user-manual.txt index b16983668..517daca08 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -1196,7 +1196,7 @@ the time, you will want to commit your changes before you can merge, and if you don't, then linkgit:git-stash[1] can take these changes away while you're doing the merge, and reapply them afterwards. -If the changes are independant enough, Git will automatically complete +If the changes are independent enough, Git will automatically complete the merge and commit the result (or reuse an existing commit in case of <<fast-forwards,fast-forward>>, see below). On the other hand, if there are conflicts--for example, if the same file is |