From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Jul 2013 19:41:52 +0000 (-0700)
Subject: Merge branch 'ap/rebase-multiple-fixups'
X-Git-Tag: v1.8.4-rc0~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb3a4fc149d1a0d604ea6abf9085b3acfe3e85e6;p=thirdparty%2Fgit.git

Merge branch 'ap/rebase-multiple-fixups'

Having multiple "fixup!" on a line in the rebase instruction sheet
did not work very well with "git rebase -i --autosquash".

* ap/rebase-multiple-fixups:
  lib-rebase: style: use write_script, <<-\EOF
  rebase -i: handle fixup! fixup! in --autosquash
---

eb3a4fc149d1a0d604ea6abf9085b3acfe3e85e6