summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-10-03 10:05:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-03 10:05:58 (GMT)
commite66273a6abb8e9cd0967d52113e29c8014a255f8 (patch)
tree6f17cc631f26ba74a7a94156e03e3add7ec0711c /diff.c
parent9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2 (diff)
parentd66424c4ac661c69640765260235452499d80378 (diff)
downloadgit-e66273a6abb8e9cd0967d52113e29c8014a255f8.zip
git-e66273a6abb8e9cd0967d52113e29c8014a255f8.tar.gz
git-e66273a6abb8e9cd0967d52113e29c8014a255f8.tar.bz2
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions