From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Jan 2010 22:41:48 +0000 (-0800)
Subject: Merge branch 'mh/rebase-fixup' (early part)
X-Git-Tag: v1.7.0-rc0~70
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cc6b41cc7d38c1b2de9809c0995087a2378d27ec;p=git.git

Merge branch 'mh/rebase-fixup' (early part)

* 'mh/rebase-fixup' (early part):
  rebase-i: Ignore comments and blank lines in peek_next_command
  lib-rebase: Allow comments and blank lines to be added to the rebase script
  lib-rebase: Provide clearer debugging info about what the editor did
  Add a command "fixup" to rebase --interactive
  t3404: Use test_commit to set up test repository
---

cc6b41cc7d38c1b2de9809c0995087a2378d27ec