summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-23 12:39:04 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-23 12:39:05 -0700
commit1f643446598c3727b506a46d88f734b13e90dc77 (patch)
tree7dcbb73fe11b182209a398e56cf02469f7af7db1 /git-rebase--interactive.sh
parentd1ca788fcd34962a65924843ef1d0c773d565030 (diff)
parenta6754cda4362d129738d42d2683d07d433379e99 (diff)
downloadgit-1f643446598c3727b506a46d88f734b13e90dc77.tar.gz
Merge branch 'jk/rebase-i-submodule-conflict-only'
Giving "--continue" to a conflicted "rebase -i" session skipped a commit that only results in changes to submodules. By John Keeping * jk/rebase-i-submodule-conflict-only: rebase -i continue: don't skip commits that only change submodules
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 2b7eb6dda4..2e1325824c 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -672,7 +672,7 @@ rearrange_squash () {
case "$action" in
continue)
# do we have anything to commit?
- if git diff-index --cached --quiet --ignore-submodules HEAD --
+ if git diff-index --cached --quiet HEAD --
then
: Nothing to commit -- skip this
else