diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-03 17:18:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-03 17:18:21 -0700 |
| commit | e33b1dfe2834ceca1c449ec653dea636ca2d0200 (patch) | |
| tree | bfcef21ab182db7524419712a138d32deaf33fe8 /Documentation | |
| parent | Merge branch 'js/repoconfig' into next (diff) | |
| parent | Merge branch 'fix' (diff) | |
| download | tgif-e33b1dfe2834ceca1c449ec653dea636ca2d0200.tar.xz | |
Merge branch 'master' into next
* master:
fix various typos in documentation
blame: Fix path pruning
cvsserver: use git-rev-list instead of git-log
Fix "git-log --parents" breakage post v1.3.0
add documentation for update-index --unresolve
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-update-index.txt | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 2169169850..906830d4bf 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -92,7 +92,7 @@ separated with a single space are given. 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 diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index d4137fc87e..23f2b6f1a5 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -10,12 +10,12 @@ SYNOPSIS -------- [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] - [--really-refresh] + [--really-refresh] [--unresolve] [--info-only] [--index-info] [-z] [--stdin] [--verbose] @@ -80,6 +80,10 @@ OPTIONS filesystem that has very slow lstat(2) system call (e.g. cifs). +--unresolve:: + Restores the 'unmerged' or 'needs updating' state of a + file during a merge if it was cleared by accident. + --info-only:: Do not create objects in the object database for all <file> arguments that follow this flag; just insert |