| commit | 0b17b4331087224883878e49342037bf69717b62 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Apr 2014 17:42:45 +0000 (21 10:42 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Apr 2014 17:42:46 +0000 (21 10:42 -0700) | ||
| tree | 36812666a6ea99efc7455c7437a5e560f3803d46 | treesnapshot (tar.gz zip) |
| parent | 0e6e1a5fbdd3143b74bf45f009bb4e850bdc785a | commitdiff |
| parent | 8cd65967fe0084574fcee278a5f9ff3d14047c4f | commitdiff |
Merge branch 'km/avoid-non-function-return-in-rebase'
Work around /bin/sh that does not like "return" at the top-level
of a file that is dot-sourced from inside a function definition.
* km/avoid-non-function-return-in-rebase:
Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
rebase: avoid non-function use of "return" on FreeBSD
Work around /bin/sh that does not like "return" at the top-level
of a file that is dot-sourced from inside a function definition.
* km/avoid-non-function-return-in-rebase:
Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
rebase: avoid non-function use of "return" on FreeBSD
| git-rebase--am.sh | diff1 | diff2 | blobhistory |
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| git-rebase--merge.sh | diff1 | diff2 | blobhistory |
| git-rebase.sh | diff1 | diff2 | blobhistory |