Merge branch 'jc/commit'

* jc/commit:
  commit: detect misspelled pathspec while making a partial commit.
  combine-diff: diff-files fix (#2)
  combine-diff: diff-files fix.

diff --cc git-commit.sh
index ab5e6bc1c8e594bdaba9d1950c18efa7c45d8852,fe9b6e75282190cde83a76908495563a37b98517..f7ee1aadee1eb947603dadbd6ec077dab07f6a19
--- 1/git-commit.sh
--- 2/git-commit.sh
+++ b/git-commit.sh
@@@ -340,12 -341,8 +341,8 @@@ case "$#,$also$only" i
  0,)
    ;;
  *,)
-   echo >&2 "assuming --only paths..."
 -  only_include_assumed="# Explicit paths specified without -i nor -o; assuming --include paths..."
 -  also=t
++  only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
 +  also=
- 
-   # If we are going to launch an editor, the message won't be
-   # shown without this...
-   test -z "$log_given$status_only" && sleep 1
    ;;
  esac
  unset only