summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-12-01Merge branch 'maint'Libravatar Jeff King15-82/+140
2015-12-01Merge branch 'eg/p4-submit-catch-failure' into maintLibravatar Jeff King2-35/+38
2015-12-01Merge branch 'dk/check-ignore-docs' into maintLibravatar Jeff King1-5/+5
2015-12-01Merge branch 'ld/p4-detached-head' into maintLibravatar Jeff King2-9/+36
2015-12-01Merge branch 'sg/filter-branch-dwim-ambiguity' into maintLibravatar Jeff King2-1/+8
2015-12-01Merge branch 'mg/doc-word-diff-example' into maintLibravatar Jeff King1-0/+3
2015-12-01Merge branch 'cb/ssl-config-pathnames' into maintLibravatar Jeff King1-2/+2
2015-12-01Merge branch 'dk/t5813-unc-paths' into maintLibravatar Jeff King1-2/+2
2015-12-01Merge branch 'dk/rerere-train-quoting' into maintLibravatar Jeff King1-1/+1
2015-12-01Merge branch 'cb/hook-sigpipe' into maintLibravatar Jeff King3-20/+27
2015-12-01Merge branch 'fm/shell-path-whitespace' into maintLibravatar Jeff King1-1/+1
2015-12-01Merge branch 'ar/doc-env-variable-format' into maintLibravatar Jeff King1-6/+6
2015-12-01Merge branch 'pt/http-socks-proxy' into maintLibravatar Jeff King1-0/+11
2015-12-01Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maintLibravatar Jeff King1-1/+7
2015-11-28wt-status: correct and simplify check for detached HEADLibravatar René Scharfe1-5/+4
2015-11-28ident.c: add support for IPv6Libravatar Elia Pinto1-4/+27
2015-11-28Add Travis CI supportLibravatar Lars Schneider1-0/+91
2015-11-28add "ok=sigpipe" to test_must_fail and use it to fix flaky testsLibravatar Lars Schneider3-6/+8
2015-11-28implement test_might_fail using a refactored test_must_failLibravatar Lars Schneider1-14/+33
2015-11-24Merge branch 'fp/subtree-todo-update'Libravatar Jeff King1-2/+0
2015-11-24Merge branch 'rc/configure-use-libs-when-checking-a-lib'Libravatar Jeff King1-1/+7
2015-11-24Merge branch 'maint'Libravatar Jeff King1-0/+1
2015-11-24http: treat config options sslCAPath and sslCAInfo as pathsLibravatar Charles Bailey1-2/+2
2015-11-24Documentation/diff: give --word-diff-regex=. exampleLibravatar Michael J Gruber1-0/+3
2015-11-24filter-branch: deal with object name vs. pathname ambiguity in tree-filterLibravatar SZEDER Gábor2-1/+8
2015-11-24send-email: die if CA path doesn't existLibravatar John Keeping1-2/+1
2015-11-24check-ignore: correct documentation about outputLibravatar Dennis Kaarsemaker1-5/+5
2015-11-24blame: fix object casting regressionLibravatar Jeff King2-16/+21
2015-11-24Documentation/git-update-index: add missing opts to synopsysLibravatar Christian Couder1-0/+1
2015-11-24git-p4: clean up after p4 submit failureLibravatar GIRARD Etienne2-35/+38
2015-11-24bash prompt: indicate dirty index even on orphan branchesLibravatar SZEDER Gábor2-5/+4
2015-11-24bash prompt: remove a redundant 'git diff' optionLibravatar SZEDER Gábor1-1/+1
2015-11-24bash prompt: test dirty index and worktree while on an orphan branchLibravatar SZEDER Gábor1-3/+28
2015-11-24git-p4: work with a detached headLibravatar Luke Diamand2-8/+17
2015-11-24git-p4: add option to system() to return subshell statusLibravatar Luke Diamand1-2/+4
2015-11-24git-p4: add failing test for submit from detached headLibravatar Luke Diamand1-0/+16
2015-11-20push: add recurseSubmodules config optionLibravatar Mike Crowe7-26/+234
2015-11-20credential-cache: new option to ignore sighupLibravatar Noam Postavsky2-0/+10
2015-11-20show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPLibravatar René Scharfe1-11/+1
2015-11-20fsck: treat a NUL in a tag header as an errorLibravatar René Scharfe2-2/+3
2015-11-20grep: stop using PARSE_OPT_NO_INTERNAL_HELPLibravatar René Scharfe1-16/+1
2015-11-20t1450: add tests for NUL in headers of commits and tagsLibravatar René Scharfe1-0/+32
2015-11-20parse-options: allow -h as a short optionLibravatar René Scharfe2-6/+11
2015-11-20parse-options: inline parse_options_usage() at its only remaining callerLibravatar René Scharfe1-12/+1
2015-11-20parse-options: deduplicate parse_options_usage() callsLibravatar René Scharfe1-6/+12
2015-11-20completion: add support for completing email aliasesLibravatar Jacob Keller1-0/+16
2015-11-20git-p4: add trap to kill p4d on test exitLibravatar Lars Schneider1-0/+9
2015-11-20modernize t9300: move test preparations into test_expect_successLibravatar Johannes Sixt1-1250/+1264
2015-11-20send-email: expand path in sendemail.smtpsslcertpath configLibravatar John Keeping1-1/+1
2015-11-20sendemail: teach git-send-email to dump alias namesLibravatar Jacob Keller3-0/+108