summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2007-10-09 23:00:03 +0200
committerShawn O. Pearce <spearce@spearce.org>2007-10-15 22:11:02 -0400
commit06ada1529ce46e84aaef4e5608c1101c1c7ec73f (patch)
tree7a57504018332d6857c17f474a27681f1c91b4a6 /Documentation/git-merge-index.txt
parent2ef8ac1b2a2d310642b8ae4dbec4b8173b4b1213 (diff)
downloadgit-06ada1529ce46e84aaef4e5608c1101c1c7ec73f.tar.gz
Fix some typos, punctuation, missing words, minor markup.
Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/git-merge-index.txt')
-rw-r--r--Documentation/git-merge-index.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 17e9f10c65..b726ddfe12 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -40,7 +40,7 @@ If "git-merge-index" is called with multiple <file>s (or -a) then it
processes them in turn only stopping if merge returns a non-zero exit
code.
-Typically this is run with the a script calling git's imitation of
+Typically this is run with a script calling git's imitation of
the merge command from the RCS package.
A sample script called "git-merge-one-file" is included in the