tests: check git does not barf on merge.ff values for future versions of git

Jonathan Nieder committed over 15 years ago

tests: teach verify_parents to check for extra parents

Jonathan Nieder committed over 15 years ago

merge: introduce merge.ff configuration variable

Junio C Hamano committed over 15 years ago

Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config

Junio C Hamano committed over 15 years ago

merge: make branch.<name>.mergeoptions correctly override merge.<option>

Junio C Hamano committed over 15 years ago

tests: eliminate unnecessary setup test assertions

Jonathan Nieder committed over 15 years ago

Update draft release notes to 1.7.6

Junio C Hamano committed over 15 years ago

Merge branch 'jn/run-command-error-failure'

Junio C Hamano committed over 15 years ago

Merge branch 'js/info-man-path'

Junio C Hamano committed over 15 years ago

Merge branch 'im/hashcmp-optim'

Junio C Hamano committed over 15 years ago

Merge branch 'jk/merge-one-file-working-tree'

Junio C Hamano committed over 15 years ago

Merge branch 'jc/fix-diff-files-unmerged'

Junio C Hamano committed over 15 years ago

Merge branch 'cj/p4merge'

Junio C Hamano committed over 15 years ago

Merge branch 'gr/cvsimport-alternative-cvspass-location'

Junio C Hamano committed over 15 years ago

Merge branch 'sg/completion-cleanup'

Junio C Hamano committed over 15 years ago

Merge branch 'js/blame-parsename'

Junio C Hamano committed over 15 years ago

Merge branch 'jk/format-patch-quote-special-in-from'

Junio C Hamano committed over 15 years ago

Merge branch 'nd/struct-pathspec'

Junio C Hamano committed over 15 years ago

Merge branch 'aw/maint-rebase-i-p-no-ff'

Junio C Hamano committed over 15 years ago

Merge branch 'mg/alias-expose-prefix'

Junio C Hamano committed over 15 years ago