aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | Prepare for 2.6.4Junio C Hamano2015-12-04
| * | | | | | | | | | | | Merge branch 'da/difftool' into maintJunio C Hamano2015-12-04
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano2015-12-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | RelNotes update for 2.7Junio C Hamano2015-12-04
* | | | | | | | | | | | | | Merge branch 'sg/bash-prompt-dirty-orphan'Junio C Hamano2015-12-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | bash prompt: indicate dirty index even on orphan branchesSZEDER Gábor2015-11-24
| * | | | | | | | | | | | | bash prompt: remove a redundant 'git diff' optionSZEDER Gábor2015-11-24
| * | | | | | | | | | | | | bash prompt: test dirty index and worktree while on an orphan branchSZEDER Gábor2015-11-24
* | | | | | | | | | | | | | Merge branch 'np/credential-cache-sighup'Junio C Hamano2015-12-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | credential-cache: new option to ignore sighupNoam Postavsky2015-11-20
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs/parseopt-short-help'Junio C Hamano2015-12-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe2015-11-20
| * | | | | | | | | | | | | | grep: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe2015-11-20
| * | | | | | | | | | | | | | parse-options: allow -h as a short optionRené Scharfe2015-11-20
| * | | | | | | | | | | | | | parse-options: inline parse_options_usage() at its only remaining callerRené Scharfe2015-11-20
| * | | | | | | | | | | | | | parse-options: deduplicate parse_options_usage() callsRené Scharfe2015-11-20
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jk/send-email-complete-aliases'Junio C Hamano2015-12-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | completion: add support for completing email aliasesJacob Keller2015-11-20
| * | | | | | | | | | | | | | sendemail: teach git-send-email to dump alias namesJacob Keller2015-11-20
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | 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