diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-07 00:04:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-07 00:04:01 -0700 |
| commit | a6080a0a44d5ead84db3dabbbc80e82df838533d (patch) | |
| tree | 37360b8334cf8459609d1fae72f8213947858cc0 /Documentation/git-diff-files.txt | |
| parent | d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3 (diff) | |
| download | git-a6080a0a44d5ead84db3dabbbc80e82df838533d.tar.gz git-a6080a0a44d5ead84db3dabbbc80e82df838533d.tar.xz | |
War on whitespace
This uses "git-apply --whitespace=strip" to fix whitespace errors that have
crept in to our source files over time. There are a few files that need
to have trailing whitespaces (most notably, test vectors). The results
still passes the test, and build result in Documentation/ area is unchanged.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff-files.txt')
| -rw-r--r-- | Documentation/git-diff-files.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 2e1e29ef5..d8a0a8602 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -26,7 +26,7 @@ include::diff-options.txt[] branch" respectively. With these options, diffs for merged entries are not shown. + -The default is to diff against our branch (-2) and the +The default is to diff against our branch (-2) and the cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show "Unmerged". @@ -58,4 +58,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- Part of the gitlink:git[7] suite - |