diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-06-08 16:13:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-06-08 16:13:44 +0000 |
| commit | a77a51375dec1ea55c96563953187d6ce3d924cd (patch) | |
| tree | bd5e64c4f3d367dcf2be694575f0e5edcb03b1a7 /git-diff-files.txt | |
| parent | 359b40ddcc057e3c5e382544a151c97db2db5002 (diff) | |
| download | git-htmldocs-a77a51375dec1ea55c96563953187d6ce3d924cd.tar.gz | |
Autogenerated HTML docs for v1.5.2.1-144-gabc40
Diffstat (limited to 'git-diff-files.txt')
| -rw-r--r-- | git-diff-files.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-diff-files.txt b/git-diff-files.txt index 2e1e29ef5..d8a0a8602 100644 --- a/git-diff-files.txt +++ b/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 - |