diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-13 00:40:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 00:40:19 -0800 |
| commit | 1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed (patch) | |
| tree | 71ca0e8d6b33a53c3927748ca027c49277061cdb | |
| parent | 9279bf3ab6739cd5854c21418c5d28412287ba07 (diff) | |
| parent | 12dd1112886f18730ee471420619e77783cd5943 (diff) | |
| download | git-1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed.tar.gz git-1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed.tar.xz | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
Avoid spurious error messages on error mistakes.
contrib/examples/README: give an explanation of the status of these files
| -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 |