diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 22:06:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 22:06:41 +0200 |
| commit | af3a43cb111bc3136389a9f1285fbccb97f42205 (patch) | |
| tree | 93e01dfc8878b64cd28f3c0e56348a5d1627c717 /git-rebase--merge.sh | |
| parent | Merge branch 'lv/status-say-working-tree-not-directory' into maint (diff) | |
| parent | rebase: update comment about FreeBSD /bin/sh (diff) | |
| download | git-af3a43cb111bc3136389a9f1285fbccb97f42205.tar.xz git-af3a43cb111bc3136389a9f1285fbccb97f42205.zip | |
Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint
Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
* em/newer-freebsd-shells-are-fine-with-returns:
rebase: update comment about FreeBSD /bin/sh
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 8d43db9069..06a4723d4d 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -107,8 +107,8 @@ finish_rb_merge () { # below were not inside any function, and expected to return # to the function that dot-sourced us. # -# However, FreeBSD /bin/sh misbehaves on such a construct and -# continues to run the statements that follow such a "return". +# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a +# construct and continue to run the statements that follow such a "return". # As a work-around, we introduce an extra layer of a function # here, and immediately call it after defining it. git_rebase__merge () { |