diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-13 01:25:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 01:25:55 -0800 |
| commit | 3ea95d2b0e6fa63e66de24a5084e217102ab9e8a (patch) | |
| tree | d469977283d856931cbb007ef8cca2a2d460054f | |
| parent | 323b9db839cc4e49008666e402aac3264e359423 (diff) | |
| parent | 885a1ffb936cb8e32a15413a9a2404a4b4200f62 (diff) | |
| download | git-3ea95d2b0e6fa63e66de24a5084e217102ab9e8a.tar.gz git-3ea95d2b0e6fa63e66de24a5084e217102ab9e8a.tar.xz | |
Merge branch 'maint'
* maint:
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 |