git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b05fc49 99855dd)
Merge branch 'mm/rebase-continue-freebsd-WB'
authorJunio C Hamano <redacted>
Fri, 20 Sep 2013 19:34:36 +0000 (12:34 -0700)
committerJunio C Hamano <redacted>
Fri, 20 Sep 2013 19:34:37 +0000 (12:34 -0700)
commitf26f250b442b57d0e6d9295bb98690ce70640759
tree97cbfc19ead16946bc30b7f5f8c56290f6b199f8tree | snapshot
parentb05fc49adc7fc288ce5b8eebb576b0142297982dcommit | diff
parent99855ddf4bd319cd06a0524e755ab1c1b7d39f3bcommit | diff
Merge branch 'mm/rebase-continue-freebsd-WB'

Work around a bug in FreeBSD shell that caused a regression to "git
rebase" in v1.8.4.  May need to be later applied to 'maint'.

* mm/rebase-continue-freebsd-WB:
  rebase: fix run_specific_rebase's use of "return" on FreeBSD
git-rebase.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT