builtin/commit.c: extract ignore_non_trailer() helper function

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 0bdebff6f7985918855286b5fc5072dce4b644e5..c0856a6e0a0a625fcc4c394057597d633a0487ac 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -164,7 +164,7 @@ which case it outputs:
 'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine
 detailed information on unmerged paths.
 
-For an unmerged path, instead of recording a single mode/SHA1 pair,
+For an unmerged path, instead of recording a single mode/SHA-1 pair,
 the index records up to three such pairs; one from tree O in stage
 1, A in stage 2, and B in stage 3.  This information can be used by
 the user (or the porcelain) to see what should eventually be recorded at the