diff options
| author | Bill Lear <rael@zopyra.com> | 2007-01-27 13:21:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-27 21:46:59 (GMT) |
| commit | 16507fcf0a9991976815972faa253d77804d6f35 (patch) | |
| tree | eb62b3bb12b1ca375f18dd61a8173e34790b4a9f /Documentation | |
| parent | d67778eccdf778f0fc252aaade8a47c23bfebbd6 (diff) | |
| download | git-16507fcf0a9991976815972faa253d77804d6f35.zip git-16507fcf0a9991976815972faa253d77804d6f35.tar.gz git-16507fcf0a9991976815972faa253d77804d6f35.tar.bz2 | |
Document --check option to git diff.
Signed-off-by: Bill Lear <rael@zopyra.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/SubmittingPatches | 3 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 41b76d8..ce85d06 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -23,7 +23,8 @@ probably need to split up your commit to finer grained pieces. Oh, another thing. I am picky about whitespaces. Make sure your changes do not trigger errors with the sample pre-commit hook shipped -in templates/hooks--pre-commit. +in templates/hooks--pre-commit. To help ensure this does not happen, +run git diff --check on your changes before you commit. (2) Generate your patch using git tools out of your commits. diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index da1cc60..019a39f 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -58,6 +58,10 @@ Turn off rename detection, even when the configuration file gives the default to do so. +--check:: + Warn if changes introduce trailing whitespace + or an indent that uses a space before a tab. + --full-index:: Instead of the first handful characters, show full object name of pre- and post-image blob on the "index" |