diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-07 02:26:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-07 02:26:24 -0700 |
| commit | ee9693e246669f48f6b058a1044cefa973a44c22 (patch) | |
| tree | 80f0985cb14b578e9d13c04ad39a47dd8eccb3a2 /git-commit.sh | |
| parent | 39415449ee9b0bfbd6026e38c6e5d43f99759bf2 (diff) | |
| parent | 5e7f56ac33f7a5583f9fa4e0b6088709fea7a6f8 (diff) | |
| download | git-ee9693e246669f48f6b058a1044cefa973a44c22.tar.gz | |
Merge branch 'jc/index-output'
* jc/index-output:
git-read-tree --index-output=<file>
_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
Conflicts:
builtin-apply.c
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-commit.sh b/git-commit.sh index 292cf967e3..9e0959aec0 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -370,8 +370,8 @@ t,) # the same way. if test -z "$initial_commit" then - cp "$THIS_INDEX" "$TMP_INDEX" - GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -i -m HEAD + GIT_INDEX_FILE="$THIS_INDEX" \ + git-read-tree --index-output="$TMP_INDEX" -i -m HEAD else rm -f "$TMP_INDEX" fi || exit |