]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9b0185c d66424c)
Merge branch 'lh/merge'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Oct 2007 10:05:58 +0000 (03:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Oct 2007 10:05:58 +0000 (03:05 -0700)
commite66273a6abb8e9cd0967d52113e29c8014a255f8
tree6f17cc631f26ba74a7a94156e03e3add7ec0711ctree | snapshot
parent9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2commit | diff
parentd66424c4ac661c69640765260235452499d80378commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
Documentation/git-merge.txt diff1 | diff2 | blob | history
git-merge.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.