Junio C Hamano e66273a6ab Merge branch 'lh/merge' ...

* lh/merge:
  git-merge: add --ff and --no-ff options
  git-merge: add support for --commit and --no-squash
  git-merge: add support for branch.<name>.mergeoptions
  git-merge: refactor option parsing
  git-merge: fix faulty SQUASH_MSG
  Add test-script for git-merge porcelain

2007-10-03 03:05:58 -07:00

12 KiB

Executable File

Raw Blame History

View Raw