summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-01-31 13:24:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-31 18:24:53 (GMT)
commit6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566 (patch)
tree7e41d2a126b9090d7d3eaaa37c4dead8ce2a090a /Documentation/user-manual.txt
parentb0883aa6c77111e88496bd0afe073caf68ab9f99 (diff)
downloadgit-6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566.zip
git-6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566.tar.gz
git-6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566.tar.bz2
Fix typos in technical documentation.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index b169836..517daca 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/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