diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-08-05 17:05:02 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-08-05 23:07:00 -0700 |
| commit | 2c6e4771959dbe8116f39587d912f1215c06cd0d (patch) | |
| tree | 4a0507fb450fc5c74ecc489701917f188a0a5077 /Documentation/git-merge-cache.txt | |
| parent | [PATCH] git-commit-script fix for degenerated merge (diff) | |
| download | tgif-2c6e4771959dbe8116f39587d912f1215c06cd0d.tar.xz | |
[PATCH] Assorted documentation patches
[jc: Johannes spent time and effort to see how consistent our
use of terminilogy is, and as a byproduct made these corrections
not related to the terminology unification. I really appreciate
it.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-cache.txt')
| -rw-r--r-- | Documentation/git-merge-cache.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-cache.txt b/Documentation/git-merge-cache.txt index f1fbb5ddec..bd3c9ca75f 100644 --- a/Documentation/git-merge-cache.txt +++ b/Documentation/git-merge-cache.txt @@ -21,7 +21,7 @@ files are passed as arguments 5, 6 and 7. OPTIONS ------- --:: - Interpret all future arguments as filenames. + Interpret all following arguments as filenames. -a:: Run merge against all files in the cache that need merging. |