Junio C Hamano acc9c78da2 Merge branch 'pn/commit-autosquash' into next ...

* pn/commit-autosquash:
  add tests of commit --squash
  commit: --squash option for use with rebase --autosquash
  add tests of commit --fixup
  commit: --fixup option for use with rebase --autosquash
  pretty.c: teach format_commit_message() to reencode the output
  commit: helper methods to reduce redundant blocks of code

Conflicts:
	t/t3415-rebase-autosquash.sh

2010-11-24 16:00:32 -08:00

40 KiB

Raw Blame History

View Raw