diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-18 22:48:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-18 22:48:06 (GMT) |
| commit | d54fe394acbad36e9d0fd960d5e10f2769a8041b (patch) | |
| tree | ffd71f86a9a602f4b52d2e518a530d5a2de2921f /Documentation | |
| parent | 304de2d2d6afc7500fe9b8f2e22dd0a16a902d8b (diff) | |
| parent | 0c66d6be4f888096865b8f3d5fdc00c83e4ecc3f (diff) | |
| download | git-d54fe394acbad36e9d0fd960d5e10f2769a8041b.zip git-d54fe394acbad36e9d0fd960d5e10f2769a8041b.tar.gz git-d54fe394acbad36e9d0fd960d5e10f2769a8041b.tar.bz2 | |
Merge branch 'ar/diff'
* ar/diff:
Add tests for --quiet option of diff programs
try-to-simplify-commit: use diff-tree --quiet machinery.
revision.c: explain what tree_difference does
Teach --quiet to diff backends.
diff --quiet
Remove unused diffcore_std_no_resolve
Allow git-diff exit with codes similar to diff(1)
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index d8696b7..77a3f78 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -159,5 +159,10 @@ -w:: Shorthand for "--ignore-all-space". +--exit-code:: + Make the program exit with codes similar to diff(1). + That is, it exits with 1 if there were differences and + 0 means no differences. + For more detailed explanation on these common options, see also link:diffcore.html[diffcore documentation]. |