diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-11 22:37:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 22:37:38 -0800 |
| commit | f7a2eb735982e921ae4379f1dcf5f7a023610393 (patch) | |
| tree | 26fe2c59a8fed68a531e7b855a495f52198162a2 /Documentation/git-merge-index.txt | |
| parent | 23ea3e201cea0deea909569e08e950a9ec2345f7 (diff) | |
| parent | 7765e7ebda7e273bca34e87110be899447068b58 (diff) | |
This is GIT 1.0-rc1 in disguise. It is plausible that
relatively new parts of the system still need tweaking and
fixing, but that is why it is not 1.0 but rc ;-).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-index.txt')
| -rw-r--r-- | Documentation/git-merge-index.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index d072fdaa4f..60306429fb 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -12,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -This looks up the <file>(s) in the cache and, if there are any merge +This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7. @@ -23,7 +23,7 @@ OPTIONS Interpret all following arguments as filenames. -a:: - Run merge against all files in the cache that need merging. + Run merge against all files in the index that need merging. -o:: Instead of stopping at the first failed merge, do all of them |