Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'cb/maint-report-mount-point-correctly-in-setup'
[gitweb.git]
/
git-rebase--interactive.sh
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index 2b7eb6dda4811baed98411f9191ac164a3c660d5..2e1325824c5d1457a3a29fbf2b80661c05f035e6 100644
(file)
--- 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