summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-23 17:13:55 -0700
committerJunio C Hamano <gitster@pobox.com>2007-09-23 17:13:55 -0700
commit4f337e24662f07513fd6e8388f27f13dbe44cadc (patch)
tree8ad206ef3ff7aa7117a5c9120bbd45345ff7ae3a /git-rebase.sh
parent17ed158021ead9cb056f692fc35ff3fcde96a747 (diff)
parent15eda0202aa3c63fa7b8f9f72df86f4e50eb1d2b (diff)
downloadgit-4f337e24662f07513fd6e8388f27f13dbe44cadc.tar.gz
Merge branch 'maint'
* maint: git-svn: don't attempt to spawn pager if we don't want one Supplant the "while case ... break ;; esac" idiom User Manual: add a chapter for submodules user-manual: don't assume refs are stored under .git/refs Detect exec bit in more cases. Conjugate "search" correctly in the git-prune-packed man page. Move the paragraph specifying where the .idx and .pack files should be Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index c9942f2400..1583402a06 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -122,15 +122,14 @@ finish_rb_merge () {
is_interactive () {
test -f "$dotest"/interactive ||
- while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
- do
+ while :; do case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
shift
done && test -n "$1"
}
is_interactive "$@" && exec git-rebase--interactive "$@"
-while case "$#" in 0) break ;; esac
+while test $# != 0
do
case "$1" in
--continue)