Merge branch 'jk/ssh-funny-url' into maint-2.7

Junio C Hamano committed about 9 years ago

connect: reject paths that look like command line options

Jeff King committed about 9 years ago

connect: reject dashed arguments for proxy commands

Jeff King committed about 9 years ago

connect: factor out "looks like command line option" check

Jeff King committed about 9 years ago

t5813: add test for hostname starting with dash

Jeff King committed about 9 years ago

connect: reject ssh hostname that begins with a dash

Junio C Hamano committed about 9 years ago

t/lib-proto-disable: restore protocol.allow after config tests

Jeff King committed about 9 years ago

tests: ensure fsck fails on corrupt packfiles

Jonathan Tan committed about 9 years ago

Documentation/checkout: clarify submodule HEADs to be detached

Stefan Beller committed about 9 years ago

doc: remove unsupported parameter from patch-id

Andreas Heiduk committed about 9 years ago

rebase -i: rearrange fixup/squash lines using the rebase--helper

Johannes Schindelin committed about 9 years ago

t3415: test fixup with wrapped oneline

Johannes Schindelin committed about 9 years ago

rebase -i: skip unnecessary picks using the rebase--helper

Johannes Schindelin committed about 9 years ago

rebase -i: check for missing commits in the rebase--helper

Johannes Schindelin committed about 9 years ago

t3404: relax rebase.missingCommitsCheck tests

Johannes Schindelin committed about 9 years ago

rebase -i: also expand/collapse the SHA-1s via the rebase--helper

Johannes Schindelin committed about 9 years ago

rebase -i: do not invent onelines when expanding/collapsing SHA-1s

Johannes Schindelin committed about 9 years ago

rebase -i: remove useless indentation

Johannes Schindelin committed about 9 years ago

rebase -i: generate the script via rebase--helper

Johannes Schindelin committed about 9 years ago

t3415: verify that an empty instructionFormat is handled as before

Johannes Schindelin committed about 9 years ago