diff options
| -rw-r--r-- | contrib/examples/README | 3 | ||||
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/examples/README b/contrib/examples/README new file mode 100644 index 000000000..6946f3dd2 --- /dev/null +++ b/contrib/examples/README @@ -0,0 +1,3 @@ +These are original scripted implementations, kept primarily for their +reference value to any aspiring plumbing users who want to learn how +pieces can be fit together. diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c8b0861c0..8ed224481 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -349,7 +349,7 @@ do_next () { squash|s) comment_for_reflog squash - has_action "$DONE" || + test -f "$DONE" && has_action "$DONE" || die "Cannot 'squash' without a previous commit" mark_action_done |