push: test that --recurse-submodules on command line overrides config

Mike Crowe committed almost 11 years ago

Sync with maint

Junio C Hamano committed almost 11 years ago

Prepare for 2.6.4

Junio C Hamano committed almost 11 years ago

Merge branch 'da/difftool' into maint

Junio C Hamano committed almost 11 years ago

Merge branch 'dk/gc-idx-wo-pack' into maint

Junio C Hamano committed almost 11 years ago

RelNotes update for 2.7

Junio C Hamano committed almost 11 years ago

Merge branch 'sg/bash-prompt-dirty-orphan'

Junio C Hamano committed almost 11 years ago

Merge branch 'np/credential-cache-sighup'

Junio C Hamano committed almost 11 years ago

Merge branch 'rs/parseopt-short-help'

Junio C Hamano committed almost 11 years ago

Merge branch 'jk/send-email-complete-aliases'

Junio C Hamano committed almost 11 years ago

Merge branch 'jk/filter-branch-no-index'

Junio C Hamano committed almost 11 years ago

Merge branch 'ad/sha1-update-chunked'

Junio C Hamano committed almost 11 years ago

Merge branch 'mk/blame-first-parent'

Jeff King committed almost 11 years ago

Merge branch 'jk/send-email-ca-path'

Jeff King committed almost 11 years ago

Merge branch 'rs/fsck-nul-header'

Jeff King committed almost 11 years ago

Merge branch 'ls/p4-test-timeouts'

Jeff King committed almost 11 years ago

Merge branch 'js/test-modernize-t9300'

Jeff King committed almost 11 years ago

Merge branch 'jk/send-email-expand-paths'

Jeff King committed almost 11 years ago

Merge branch 'dg/subtree-test-cleanup'

Jeff King committed almost 11 years ago

Merge branch 'dt/http-range'

Jeff King committed almost 11 years ago