diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-07-21 10:51:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-22 01:51:47 (GMT) |
| commit | 51ef1daa4a0dfaa4d777b2fa949ba051cf800554 (patch) | |
| tree | 425a833e5262832fae1d3512722cca8c868f0965 /git-quiltimport.sh | |
| parent | 59eb68aa2b4e52aa1d098e0d76c5130864ceff2e (diff) | |
| download | git-51ef1daa4a0dfaa4d777b2fa949ba051cf800554.zip git-51ef1daa4a0dfaa4d777b2fa949ba051cf800554.tar.gz git-51ef1daa4a0dfaa4d777b2fa949ba051cf800554.tar.bz2 | |
Rename .git/rebase to .git/rebase-apply
With git-am, it sounds awkward to have the patches in ".git/rebase/",
but for technical reasons, we have to keep the same directory name
for git-am and git-rebase. ".git/rebase-apply" seems to be a good
compromise.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-quiltimport.sh')
| -rwxr-xr-x | git-quiltimport.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-quiltimport.sh b/git-quiltimport.sh index c9aecfd..cebaee1 100755 --- a/git-quiltimport.sh +++ b/git-quiltimport.sh @@ -53,7 +53,7 @@ if ! [ -d "$QUILT_PATCHES" ] ; then fi # Temporary directories -tmp_dir="$GIT_DIR"/rebase +tmp_dir="$GIT_DIR"/rebase-apply tmp_msg="$tmp_dir/msg" tmp_patch="$tmp_dir/patch" tmp_info="$tmp_dir/info" |