path: root/
diff options
authorJeff King <>2015-12-01 22:32:38 (GMT)
committerJeff King <>2015-12-01 22:32:38 (GMT)
commit40fdcc535783f5c64e6aba9f4b2d2c8997c55a8d (patch)
tree95a2da48eec35b7bfacf36beb80b05dcea84d6e1 /
parent1bc8feaa7cc752fe3b902ccf83ae9332e40921db (diff)
parent908a6e4156dff47d4877478383fd4b79592010e2 (diff)
Merge branch 'maint'
* maint: http: treat config options sslCAPath and sslCAInfo as paths Documentation/diff: give --word-diff-regex=. example filter-branch: deal with object name vs. pathname ambiguity in tree-filter check-ignore: correct documentation about output git-p4: clean up after p4 submit failure git-p4: work with a detached head git-p4: add option to system() to return subshell status git-p4: add failing test for submit from detached head remote-http(s): support SOCKS proxies t5813: avoid creating urls that break on cygwin Escape Git's exec path in contrib/ script allow hooks to ignore their standard input stream rebase-i-exec: Allow space in SHELL_PATH Documentation: make environment variable formatting more consistent
Diffstat (limited to '')
1 files changed, 1 insertions, 1 deletions
diff --git a/ b/
index 27c9c54..cefd145 100755
--- a/
+++ b/
@@ -349,7 +349,7 @@ while read commit parents; do
die "tree filter failed: $filter_tree"
- git diff-index -r --name-only --ignore-submodules $commit &&
+ git diff-index -r --name-only --ignore-submodules $commit -- &&
git ls-files --others
) > "$tempdir"/tree-state || exit
git update-index --add --replace --remove --stdin \