Skip to content

Commit 98eddaf

Browse files
committed
document difference between "--diff" and "--diff --git"
1 parent b41c47e commit 98eddaf

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

Unix/cloc

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,11 +1994,14 @@ Usage: $script [options] <file(s)/dir(s)/git hash(es)> | <set 1> <set 2> | <repo
19941994
may be any mix of files, directories, archives,
19951995
or git commit hashes. Use --diff-alignment to
19961996
generate a list showing which file pairs where
1997-
compared. When comparing git branches, only files
1998-
which have changed in either commit are compared.
1999-
See also --git, --count-and-diff, --diff-alignment,
2000-
--diff-list-file, --diff-timeout, --ignore-case,
2001-
--ignore-whitespace.
1997+
compared. File pairs are aligned by matching file
1998+
names. If --git is also given, a more sophisticated
1999+
pairing algorithm which additionally attempts to pair
2000+
renamed file is used. When comparing git branches,
2001+
only files which have changed in either commit are
2002+
compared. See also --git, --count-and-diff,
2003+
--diff-alignment, --diff-list-file, --diff-timeout,
2004+
--ignore-case, --ignore-whitespace.
20022005
--diff-timeout <N> Ignore files which take more than <N> seconds
20032006
to process. Default is 10 seconds. Setting <N>
20042007
to 0 allows unlimited time. (Large files with many

cloc

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,11 +1986,14 @@ Usage: $script [options] <file(s)/dir(s)/git hash(es)> | <set 1> <set 2> | <repo
19861986
may be any mix of files, directories, archives,
19871987
or git commit hashes. Use --diff-alignment to
19881988
generate a list showing which file pairs where
1989-
compared. When comparing git branches, only files
1990-
which have changed in either commit are compared.
1991-
See also --git, --count-and-diff, --diff-alignment,
1992-
--diff-list-file, --diff-timeout, --ignore-case,
1993-
--ignore-whitespace.
1989+
compared. File pairs are aligned by matching file
1990+
names. If --git is also given, a more sophisticated
1991+
pairing algorithm which additionally attempts to pair
1992+
renamed file is used. When comparing git branches,
1993+
only files which have changed in either commit are
1994+
compared. See also --git, --count-and-diff,
1995+
--diff-alignment, --diff-list-file, --diff-timeout,
1996+
--ignore-case, --ignore-whitespace.
19941997
--diff-timeout <N> Ignore files which take more than <N> seconds
19951998
to process. Default is 10 seconds. Setting <N>
19961999
to 0 allows unlimited time. (Large files with many

0 commit comments

Comments
 (0)