aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jk/filter-branch-no-index'Junio C Hamano2015-12-04
|\
| * filter-branch: skip index read/write when possibleJeff King2015-11-06
* | Merge branch 'ad/sha1-update-chunked'Junio C Hamano2015-12-04
|\ \
| * | sha1: allow limiting the size of the data passed to SHA1_Update()Atousa Pahlevan Duprat2015-11-05
| * | sha1: provide another level of indirection for the SHA-1 functionsAtousa Pahlevan Duprat2015-11-05
* | | Merge branch 'mk/blame-first-parent'Jeff King2015-12-01
|\ \ \
| * | | blame: fix object casting regressionJeff King2015-11-24
* | | | Merge branch 'jk/send-email-ca-path'Jeff King2015-12-01
|\ \ \ \
| * | | | send-email: die if CA path doesn't existJohn Keeping2015-11-24
* | | | | Merge branch 'rs/fsck-nul-header'Jeff King2015-12-01
|\ \ \ \ \
| * | | | | fsck: treat a NUL in a tag header as an errorRené Scharfe2015-11-20
| * | | | | t1450: add tests for NUL in headers of commits and tagsRené Scharfe2015-11-20
| |/ / / /
* | | | | Merge branch 'ls/p4-test-timeouts'Jeff King2015-12-01
|\ \ \ \ \
| * | | | | git-p4: add trap to kill p4d on test exitLars Schneider2015-11-20
| * | | | | git-p4: add p4d timeout in testsLars Schneider2015-11-20
| * | | | | git-p4: retry kill/cleanup operations in tests with timeoutLars Schneider2015-11-20
| |/ / / /
* | | | | Merge branch 'js/test-modernize-t9300'Jeff King2015-12-01
|\ \ \ \ \
| * | | | | modernize t9300: move test preparations into test_expect_successJohannes Sixt2015-11-20
| * | | | | modernize t9300: mark here-doc words to ignore tab indentationJohannes Sixt2015-11-20
| * | | | | modernize t9300: use test_when_finished for clean-upJohannes Sixt2015-11-20
| * | | | | modernize t9300: wrap lines after &&Johannes Sixt2015-11-20
| * | | | | modernize t9300: use test_must_be_emptyJohannes Sixt2015-11-20
| * | | | | modernize t9300: use test_must_failJohannes Sixt2015-11-20
| * | | | | modernize t9300: single-quote placement and indentationJohannes Sixt2015-11-20
| |/ / / /
* | | | | Merge branch 'jk/send-email-expand-paths'Jeff King2015-12-01
|\ \ \ \ \
| * | | | | send-email: expand path in sendemail.smtpsslcertpath configJohn Keeping2015-11-20
| |/ / / /
* | | | | Merge branch 'dg/subtree-test-cleanup'Jeff King2015-12-01
|\ \ \ \ \
| * | | | | contrib/subtree: Handle '--prefix' argument with a slash appendedTechlive Zheng2015-11-13
| * | | | | contrib/subtree: Make each test self-containedTechlive Zheng2015-11-13
| * | | | | contrib/subtree: Add split testsTechlive Zheng2015-11-13
| * | | | | contrib/subtree: Add merge testsTechlive Zheng2015-11-13
| * | | | | contrib/subtree: Add tests for subtree addTechlive Zheng2015-11-13
| * | | | | contrib/subtree: Add test for missing subtreeTechlive Zheng2015-11-13
| * | | | | contrib/subtree: Clean and refactor test codeTechlive Zheng2015-11-13
| | |_|_|/ | |/| | |
* | | | | Merge branch 'dt/http-range'Jeff King2015-12-01
|\ \ \ \ \
| * | | | | http: fix some printf format warningsRamsay Jones2015-11-11
* | | | | | Merge branch 'maint'Jeff King2015-12-01
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2015-12-01
| |\ \ \ \ \ \
| | * | | | | | git-p4: clean up after p4 submit failureGIRARD Etienne2015-11-24
| * | | | | | | Merge branch 'dk/check-ignore-docs' into maintJeff King2015-12-01
| |\ \ \ \ \ \ \
| | * | | | | | | check-ignore: correct documentation about outputDennis Kaarsemaker2015-11-24
| * | | | | | | | Merge branch 'ld/p4-detached-head' into maintJeff King2015-12-01
| |\ \ \ \ \ \ \ \
| | * | | | | | | | git-p4: work with a detached headLuke Diamand2015-11-24
| | * | | | | | | | git-p4: add option to system() to return subshell statusLuke Diamand2015-11-24
| | * | | | | | | | git-p4: add failing test for submit from detached headLuke Diamand2015-11-24
| * | | | | | | | | Merge branch 'sg/filter-branch-dwim-ambiguity' into maintJeff King2015-12-01
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | filter-branch: deal with object name vs. pathname ambiguity in tree-filterSZEDER Gábor2015-11-24
| * | | | | | | | | | Merge branch 'mg/doc-word-diff-example' into maintJeff King2015-12-01
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Documentation/diff: give --word-diff-regex=. exampleMichael J Gruber2015-11-24
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'cb/ssl-config-pathnames' into maintJeff King2015-12-01
| |\ \ \ \ \ \ \ \ \ \