diff options
| author | Martin Langhoff <martin@catalyst.net.nz> | 2006-05-08 10:03:37 +1200 |
|---|---|---|
| committer | Martin Langhoff <martin@catalyst.net.nz> | 2006-05-08 10:03:37 +1200 |
| commit | 50c08d48722149d95f46bcc80a5211ea04b8a809 (patch) | |
| tree | 15c465be37ba4fdd8824edb95085b81076b73af9 /Documentation/git-diff-tree.txt | |
| parent | a248c9614fdd130229fb5f9565abbd77bd1d0cc9 (diff) | |
| parent | be65e7d9fbd3ae6fc097cedade2afe39805fcf4e (diff) | |
| download | git-50c08d48722149d95f46bcc80a5211ea04b8a809.tar.xz | |
Merge with git://kernel.org/pub/scm/git/git.git
Diffstat (limited to 'Documentation/git-diff-tree.txt')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 2 |
1 files changed, 1 insertions, 1 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 |