summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e923eff)
raw | patch | inline | side by side (parent: e923eff)
author | Matthias Kestenholz <matthias@spinlock.ch> | |
Wed, 3 May 2006 10:51:40 +0000 (12:51 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 3 May 2006 21:08:41 +0000 (14:08 -0700) |
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-diff-tree.txt | patch | blob | history | |
Documentation/git-update-index.txt | patch | blob | history | |
revision.c | patch | blob | history |
index 2169169850da89283027778f47a40090bb6acfde..906830d4bf7b69e98fd1ef0d488976d29eae7749 100644 (file)
Furthermore, it lists only files which were modified
from all parents.
--cc::
+--cc::
This flag changes the way a merge commit patch is displayed,
in a similar way to the '-c' option. It implies the '-c'
and '-p' options and further compresses the patch output
index d4137fc87e0f52d775878cf239fe98182002cc95..e01b42f4457ecff994e2f7c96573ff0e70024f76 100644 (file)
--------
[verse]
'git-update-index'
- [--add] [--remove | --force-remove] [--replace]
- [--refresh [-q] [--unmerged] [--ignore-missing]]
+ [--add] [--remove | --force-remove] [--replace]
+ [--refresh] [-q] [--unmerged] [--ignore-missing]
[--cacheinfo <mode> <object> <file>]\*
[--chmod=(+|-)x]
[--assume-unchanged | --no-assume-unchanged]
diff --git a/revision.c b/revision.c
index 03dd23893947231ef8040ad3c38021ae64f27ae5..5f2f0be3825e521152448a9bb47a17c79951d56b 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -537,7 +537,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
revs->max_count = atoi(arg + 12);
continue;
}
- /* accept -<digit>, like traditilnal "head" */
+ /* accept -<digit>, like traditional "head" */
if ((*arg == '-') && isdigit(arg[1])) {
revs->max_count = atoi(arg + 1);
continue;