Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | builtin/config.c: prefer `--type=bool` over `--bool`, etc.tb/config-type | Taylor Blau | 2018-03-29 | 3 | -32/+80 |
* | Git 2.17-rc2v2.17.0-rc2 | Junio C Hamano | 2018-03-28 | 1 | -1/+1 |
* | Merge branch 'tg/stash-doc-typofix' | Junio C Hamano | 2018-03-28 | 1 | -1/+1 |
|\ | |||||
| * | git-stash.txt: remove extra square brackettg/stash-doc-typofix | Thomas Gummerer | 2018-03-27 | 1 | -1/+1 |
* | | Merge branch 'pc/submodule-helper' | Junio C Hamano | 2018-03-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | submodule deinit: handle non existing pathspecs gracefullypc/submodule-helper | Stefan Beller | 2018-03-27 | 1 | -1/+1 |
* | | | Merge branch 'nd/parseopt-completion' | Junio C Hamano | 2018-03-28 | 2 | -0/+35 |
|\ \ \ | |||||
| * | | | t9902: disable test on the list of merge-strategies under GETTEXT_POISONnd/parseopt-completion | Junio C Hamano | 2018-03-23 | 1 | -1/+1 |
| * | | | completion: clear cached --options when sourcing the completion script | SZEDER Gábor | 2018-03-22 | 2 | -0/+35 |
* | | | | Sync with Git 2.16.3 | Junio C Hamano | 2018-03-22 | 1 | -0/+49 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Git 2.16.3v2.16.3snap | Junio C Hamano | 2018-03-22 | 3 | -2/+51 |
| * | | | Merge branch 'ms/non-ascii-ticks' into maint | Junio C Hamano | 2018-03-22 | 1 | -7/+7 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/cached-commit-buffer' into maint | Junio C Hamano | 2018-03-22 | 5 | -46/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'sm/mv-dry-run-update' into maint | Junio C Hamano | 2018-03-22 | 2 | -2/+7 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'tg/worktree-create-tracking' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'gs/test-unset-xdg-cache-home' into maint | Junio C Hamano | 2018-03-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'sb/status-doc-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rd/typofix' into maint | Junio C Hamano | 2018-03-22 | 5 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bp/fsmonitor' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/doc-interpret-trailers-grammofix' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/doc-test-must-fail-args' into maint | Junio C Hamano | 2018-03-22 | 2 | -2/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rj/sparse-updates' into maint | Junio C Hamano | 2018-03-22 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/gettext-poison' into maint | Junio C Hamano | 2018-03-22 | 2 | -8/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/ignore-glob-doc-update' into maint | Junio C Hamano | 2018-03-22 | 1 | -6/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/cocci-strbuf-addf-to-addstr' into maint | Junio C Hamano | 2018-03-22 | 1 | -16/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/worktree-add-short-help' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tz/doc-show-defaults-to-head' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/shared-index-fix' into maint | Junio C Hamano | 2018-03-22 | 2 | -18/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/mailinfo-cleanup-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rb/hashmap-h-compilation-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/describe-unique-abbrev' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/submodule-doc-updates' into maint | Junio C Hamano | 2018-03-22 | 2 | -29/+87 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cl/t9001-cleanup' into maint | Junio C Hamano | 2018-03-22 | 1 | -10/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/oidmap-autoinit' into maint | Junio C Hamano | 2018-03-22 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/test-i18ngrep' into maint | Junio C Hamano | 2018-03-22 | 8 | -43/+72 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/fsck-code-cleanup' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/svn-branch-segfault-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/list-merge-strategy' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/daemon-fixes' into maint | Junio C Hamano | 2018-03-22 | 4 | -20/+107 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tg/split-index-fixes' into maint | Junio C Hamano | 2018-03-22 | 8 | -17/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mr/packed-ref-store-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/http-redact-cookies' into maint | Junio C Hamano | 2018-03-22 | 3 | -8/+117 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diff-flush-before-warning' into maint | Junio C Hamano | 2018-03-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/travis-build-during-script-phase' into maint | Junio C Hamano | 2018-03-22 | 3 | -15/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.17-rc1v2.17.0-rc1 | Junio C Hamano | 2018-03-21 | 2 | -1/+33 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/attributes-path-doc' | Junio C Hamano | 2018-03-21 | 1 | -3/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc/gitattributes: mention non-recursive behaviorjk/attributes-path-doc | Jeff King | 2018-03-20 | 1 | -3/+10 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/warning-uninitialized-fix' | Junio C Hamano | 2018-03-21 | 4 | -6/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read-cache: fix an -Wmaybe-uninitialized warningrj/warning-uninitialized-fix | Ramsay Jones | 2018-03-20 | 1 | -2/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wuninitialized: remove some 'init-self' workarounds | Ramsay Jones | 2018-03-20 | 3 | -4/+4 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |