summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-09 00:21:44 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-09 00:21:44 -0800
commit5d4138a66d265e7ddbe21d44f79bcaa1e9a6b6ff (patch)
tree47ff3839458d806fee14824f616c55cdd55b82fb /git-rebase--interactive.sh
parent063036af0832710cfcb1380cc4f9c4597b98cc26 (diff)
parentb9217c09386e5313ac6a54cc91cf03149514154b (diff)
downloadgit-5d4138a66d265e7ddbe21d44f79bcaa1e9a6b6ff.tar.gz
Merge branch 'maint'
* maint: Start preparing for 1.5.3.6 git-send-email: Change the prompt for the subject of the initial message. SubmittingPatches: improve the 'Patch:' section of the checklist instaweb: Minor cleanups and fixes for potential problems stop t1400 hiding errors in tests Makefile: add missing dependency on wt-status.h refresh_index_quietly(): express "optional" nature of index writing better Fix sed string regex escaping in module_name. Avoid a few unportable, needlessly nested "...`...". git-mailsplit: with maildirs not only process cur/, but also new/ Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 76dc679e62..51063776d2 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -391,7 +391,7 @@ do
-s|--strategy)
case "$#,$1" in
*,*=*)
- STRATEGY="-s `expr "z$1" : 'z-[^=]*=\(.*\)'`" ;;
+ STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
1,*)
usage ;;
*)