commit | 0b17b4331087224883878e49342037bf69717b62 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Apr 21 10:42:45 2014 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Apr 21 10:42:46 2014 -0700 |
tree | 36812666a6ea99efc7455c7437a5e560f3803d46 | |
parent | 0e6e1a5fbdd3143b74bf45f009bb4e850bdc785a [diff] | |
parent | 8cd65967fe0084574fcee278a5f9ff3d14047c4f [diff] |
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