Documentation: Add definition of "evil merge" to GIT Glossary

diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index a9fb6a9a5ef3cfeffa37578b4d703ca75c73f306..3dde7134a5cedc6d58a934e1dd61db26d5e459ae 100644 (file)
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -40,7 +40,7 @@ With `-t <branch>` option, instead of the default glob
 refspec for the remote to track all branches under
 `$GIT_DIR/remotes/<name>/`, a refspec to track only `<branch>`
 is created.  You can give more than one `-t <branch>` to track
-multiple branche without grabbing all branches.
+multiple branches without grabbing all branches.
 +
 With `-m <master>` option, `$GIT_DIR/remotes/<name>/HEAD` is set
 up to point at remote's `<master>` branch instead of whatever