Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pull: warn on --verify-signatures with --rebaseah/no-verify-signature-with-pull-rebase | Alexander Hirsch | 2016-05-20 | 1 | -0/+16 |
* | Merge branch 'js/windows-dotgit' | Junio C Hamano | 2016-05-17 | 2 | -0/+50 |
|\ | |||||
| * | mingw: introduce the 'core.hideDotFiles' setting | Johannes Schindelin | 2016-05-11 | 2 | -0/+50 |
* | | Merge branch 'jk/test-send-sh-x-trace-elsewhere' | Junio C Hamano | 2016-05-17 | 2 | -3/+16 |
|\ \ | |||||
| * | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhere | Jeff King | 2016-05-11 | 2 | -3/+16 |
* | | | Merge branch 'js/http-custom-headers' | Junio C Hamano | 2016-05-17 | 2 | -6/+24 |
|\ \ \ | |||||
| * | | | submodule: ensure that -c http.extraheader is heededjs/http-custom-headers | Johannes Schindelin | 2016-05-10 | 1 | -1/+10 |
| * | | | Merge branch 'jk/submodule-c-credential' into js/http-custom-headers | Junio C Hamano | 2016-05-10 | 2 | -0/+63 |
| |\ \ \ | |||||
| * | | | | t5551: make the test for extra HTTP headers more robust | Johannes Schindelin | 2016-05-10 | 1 | -1/+2 |
| * | | | | tests: adjust the configuration for Apache 2.2 | Johannes Schindelin | 2016-05-10 | 1 | -4/+12 |
* | | | | | Merge branch 'jc/fsck-nul-in-commit' | Junio C Hamano | 2016-05-17 | 1 | -0/+18 |
|\ \ \ \ \ | |||||
| * | | | | | fsck: detect and warn a commit with embedded NULjc/fsck-nul-in-commit | Junio C Hamano | 2016-05-10 | 1 | -0/+18 |
* | | | | | | Merge branch 'jc/ll-merge-internal' | Junio C Hamano | 2016-05-17 | 2 | -85/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t6036: remove pointless test that expects failurejc/ll-merge-internal | Junio C Hamano | 2016-05-09 | 1 | -83/+0 |
| * | | | | | | ll-merge: use a longer conflict marker for internal merge | Junio C Hamano | 2016-05-09 | 2 | -2/+3 |
* | | | | | | | Merge branch 'tb/t5601-sed-fix' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t5601: Remove trailing space in sed expressiontb/t5601-sed-fix | Torsten Bögershausen | 2016-05-09 | 1 | -1/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/test-seq' | Junio C Hamano | 2016-05-17 | 1 | -15/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | test-lib-functions.sh: rewrite test_seq without Perljc/test-seq | Junio C Hamano | 2016-05-09 | 1 | -1/+6 |
| * | | | | | | | test-lib-functions.sh: remove misleading comment on test_seq | Junio C Hamano | 2016-05-09 | 1 | -14/+7 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'es/test-gpg-tags' | Junio C Hamano | 2016-05-17 | 1 | -23/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t6302: simplify non-gpg caseses/test-gpg-tags | Jeff King | 2016-05-09 | 1 | -23/+22 |
* | | | | | | | | Merge branch 'ak/t4151-ls-files-could-be-empty' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t4151: make sure argument to 'test -z' is givenak/t4151-ls-files-could-be-empty | Armin Kunaschik | 2016-05-09 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/submodule-c-credential' | Junio C Hamano | 2016-05-17 | 2 | -29/+35 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | submodule: stop sanitizing config optionsjk/submodule-c-credential | Jeff King | 2016-05-06 | 1 | -26/+0 |
| * | | | | | | | submodule: use prepare_submodule_repo_env consistentlyjk/submodule-config-sanitize-fix | Jeff King | 2016-04-28 | 1 | -0/+11 |
| * | | | | | | | submodule: export sanitized GIT_CONFIG_PARAMETERS | Jeff King | 2016-04-28 | 1 | -0/+17 |
| * | | | | | | | t5550: break submodule config test into multiple sub-tests | Jeff King | 2016-04-28 | 1 | -2/+6 |
| * | | | | | | | t5550: fix typo in $HTTPD_URL | Jeff King | 2016-04-28 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'va/i18n-misc-updates' | Junio C Hamano | 2016-05-17 | 1 | -9/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | i18n: unpack-trees: avoid substituting only a verb in sentencesva/i18n-misc-updates | Vasco Almeida | 2016-05-12 | 1 | -9/+9 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/t3404-typofix' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3404: fix typojs/t3404-typofix | Johannes Schindelin | 2016-05-10 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'sb/z-is-gnutar-ism' | Junio C Hamano | 2016-05-17 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t6041: do not compress backup tar filesb/z-is-gnutar-ism | Stefan Beller | 2016-05-09 | 1 | -2/+2 |
| * | | | | | | | | | t3513: do not compress backup tar file | Stefan Beller | 2016-05-09 | 1 | -2/+2 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'lp/typofixes' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | typofix: assorted typofixes in comments, documentation and messageslp/typofixes | Li Peng | 2016-05-06 | 1 | -1/+1 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'sb/submodule-deinit-all' | Junio C Hamano | 2016-05-17 | 1 | -1/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | submodule deinit: require '--all' instead of '.' for all submodules | Stefan Beller | 2016-05-05 | 1 | -1/+23 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'ab/hooks' | Junio C Hamano | 2016-05-17 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | hooks: allow customizing where the hook directory is | Ævar Arnfjörð Bjarmason | 2016-05-04 | 1 | -0/+37 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'sb/submodule-init' | Junio C Hamano | 2016-05-17 | 3 | -6/+80 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | submodule init: redirect stdout to stderr | Stefan Beller | 2016-05-03 | 1 | -6/+18 |
| * | | | | | | | | | submodule--helper update-clone: abort gracefully on missing .gitmodules | Stefan Beller | 2016-04-29 | 1 | -0/+8 |
| * | | | | | | | | | submodule init: fail gracefully with a missing .gitmodules file | Stefan Beller | 2016-04-29 | 1 | -0/+8 |
| * | | | | | | | | | submodule: port resolve_relative_url from shell to C | Stefan Beller | 2016-04-16 | 1 | -0/+46 |
| * | | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init | Junio C Hamano | 2016-04-14 | 155 | -837/+3270 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init | Junio C Hamano | 2016-04-14 | 1 | -0/+41 |
| |\ \ \ \ \ \ \ \ \ \ |