projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 533e8af 234b3da)
Merge branch 'mh/rebase-fixup' (early part)
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:41:48 +0000 (14:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:41:48 +0000 (14:41 -0800)
commitcc6b41cc7d38c1b2de9809c0995087a2378d27ec
treea0192c7abe36de838db16737fdf7972007d8d776tree | snapshot
parent533e8af50ed6e89eabc421478c9021c4da5f404dcommit | diff
parent234b3dae2fe83ae7df2c82194cd5f5eb01fd166dcommit | diff
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
git-rebase--interactive.sh diff1 | diff2 | blob | history
Git—the stupid content tracker