Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | submodule: defend against submodule.update = !command in .gitmodules | Jonathan Nieder | 2019-12-06 | 1 | -0/+2 |
* | Sync with 2.19.3 | Johannes Schindelin | 2019-12-06 | 2 | -3/+17 |
|\ | |||||
| * | Sync with 2.18.2 | Johannes Schindelin | 2019-12-06 | 2 | -3/+17 |
| |\ | |||||
| | * | Sync with 2.17.3 | Johannes Schindelin | 2019-12-06 | 2 | -3/+17 |
| | |\ | |||||
| | | * | Sync with 2.16.6 | Johannes Schindelin | 2019-12-06 | 2 | -2/+17 |
| | | |\ | |||||
| | | | * | Sync with 2.15.4 | Johannes Schindelin | 2019-12-06 | 2 | -2/+17 |
| | | | |\ | |||||
| | | | | * | Sync with 2.14.6 | Johannes Schindelin | 2019-12-06 | 2 | -2/+17 |
| | | | | |\ | |||||
| | | | | | * | Disallow dubiously-nested submodule git directories | Johannes Schindelin | 2019-12-05 | 1 | -0/+4 |
| | | | | | * | clone --recurse-submodules: prevent name squatting on Windows | Johannes Schindelin | 2019-12-04 | 2 | -2/+13 |
* | | | | | | | Merge branch 'nd/show-gitcomp-compilation-fix' into maint | Junio C Hamano | 2018-12-15 | 3 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | parse-options: fix SunCC compiler warning | Nguyễn Thái Ngọc Duy | 2018-12-12 | 3 | -0/+6 |
* | | | | | | | | Merge branch 'es/format-patch-range-diff-fix-fix' | Junio C Hamano | 2018-12-04 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | range-diff: always pass at least minimal diff options | Martin Ågren | 2018-12-04 | 1 | -1/+10 |
* | | | | | | | | | Merge branch 'ab/push-example-in-doc' | Junio C Hamano | 2018-12-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | push: change needlessly ambiguous example in error | Ævar Arnfjörð Bjarmason | 2018-11-14 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'rt/rebase-in-c-message-fix' | Junio C Hamano | 2018-12-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin/rebase.c: remove superfluous space in messages | Ralf Thielow | 2018-12-01 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'ab/replace-graft-with-replace-advice' | Junio C Hamano | 2018-12-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | advice: don't pointlessly suggest --convert-graft-file | Ævar Arnfjörð Bjarmason | 2018-11-29 | 1 | -0/+1 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'tq/branch-style-fix' into maint | Junio C Hamano | 2018-11-21 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'tq/branch-create-wo-branch-get' into maint | Junio C Hamano | 2018-11-21 | 1 | -5/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/check-everything-connected-is-long-gone' into maint | Junio C Hamano | 2018-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'en/double-semicolon-fix' into maint | Junio C Hamano | 2018-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/void-check-attr' into maint | Junio C Hamano | 2018-11-21 | 2 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/detect-truncated-zlib-input' into maint | Junio C Hamano | 2018-11-21 | 1 | -4/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'md/exclude-promisor-objects-fix' into maint | Junio C Hamano | 2018-11-21 | 3 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/shallow-and-fetch-prune' into maint | Junio C Hamano | 2018-11-21 | 2 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/receive-deny-current-branch-fix' into maint | Junio C Hamano | 2018-11-21 | 1 | -3/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/pack-objects-mutex-init-fix' into maint | Junio C Hamano | 2018-11-21 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'en/status-multiple-renames-to-the-same-target-fix' into maint | Junio C Hamano | 2018-11-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ds/commit-graph-with-grafts' into maint | Junio C Hamano | 2018-11-21 | 2 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'en/update-ref-no-deref-stdin' into maint | Junio C Hamano | 2018-11-21 | 1 | -11/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ms/remote-error-message-update' into maint | Junio C Hamano | 2018-11-21 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/attr-pathspec-fix' into maint | Junio C Hamano | 2018-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/trailer-fixes' into maint | Junio C Hamano | 2018-11-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/rebase-stat-unrelated-fix' | Junio C Hamano | 2018-12-01 | 1 | -6/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase --stat: fix when rebasing to an unrelated history | Johannes Schindelin | 2018-11-30 | 1 | -6/+12 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-reflog-action-fix' | Junio C Hamano | 2018-12-01 | 1 | -3/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase: fix GIT_REFLOG_ACTION regression | Johannes Schindelin | 2018-11-30 | 1 | -3/+26 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* / / / / / / / / / / / / / / / / / / / / / / / / / / | format-patch: do not let its diff-options affect --range-diff | Junio C Hamano | 2018-11-30 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/delta-islands' | Junio C Hamano | 2018-11-21 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: fix off-by-one in delta-island tree-depth computation | Jeff King | 2018-11-21 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/builtin-rebase-perf-fix-err-fix' | Junio C Hamano | 2018-11-21 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase: warn about the correct tree's OID | Johannes Schindelin | 2018-11-21 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/print-size-t-with-uintmax-format' | Junio C Hamano | 2018-11-19 | 5 | -14/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upcast size_t variables to uintmax_t when printing | Torsten Bögershausen | 2018-11-12 | 5 | -14/+15 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/format-patch-cover-letter-stat-width' | Junio C Hamano | 2018-11-19 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: respect --stat in cover letter's diffstat | Nguyễn Thái Ngọc Duy | 2018-11-13 | 1 | -2/+0 |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ds/push-squelch-ambig-warning' | Junio C Hamano | 2018-11-19 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: ignore ambiguous object warnings | Derrick Stolee | 2018-11-07 | 1 | -0/+6 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |