summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* submodule: defend against submodule.update = !command in .gitmodulesJonathan Nieder2019-12-061-0/+2
* Sync with 2.19.3Johannes Schindelin2019-12-062-3/+17
|\
| * Sync with 2.18.2Johannes Schindelin2019-12-062-3/+17
| |\
| | * Sync with 2.17.3Johannes Schindelin2019-12-062-3/+17
| | |\
| | | * Sync with 2.16.6Johannes Schindelin2019-12-062-2/+17
| | | |\
| | | | * Sync with 2.15.4Johannes Schindelin2019-12-062-2/+17
| | | | |\
| | | | | * Sync with 2.14.6Johannes Schindelin2019-12-062-2/+17
| | | | | |\
| | | | | | * Disallow dubiously-nested submodule git directoriesJohannes Schindelin2019-12-051-0/+4
| | | | | | * clone --recurse-submodules: prevent name squatting on WindowsJohannes Schindelin2019-12-042-2/+13
* | | | | | | Merge branch 'nd/show-gitcomp-compilation-fix' into maintJunio C Hamano2018-12-153-0/+6
|\ \ \ \ \ \ \
| * | | | | | | parse-options: fix SunCC compiler warningNguyễn Thái Ngọc Duy2018-12-123-0/+6
* | | | | | | | Merge branch 'es/format-patch-range-diff-fix-fix'Junio C Hamano2018-12-041-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | range-diff: always pass at least minimal diff optionsMartin Ågren2018-12-041-1/+10
* | | | | | | | | Merge branch 'ab/push-example-in-doc'Junio C Hamano2018-12-011-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: change needlessly ambiguous example in errorÆvar Arnfjörð Bjarmason2018-11-141-2/+2
* | | | | | | | | | Merge branch 'rt/rebase-in-c-message-fix'Junio C Hamano2018-12-011-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/rebase.c: remove superfluous space in messagesRalf Thielow2018-12-011-2/+2
* | | | | | | | | | | Merge branch 'ab/replace-graft-with-replace-advice'Junio C Hamano2018-12-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | advice: don't pointlessly suggest --convert-graft-fileÆvar Arnfjörð Bjarmason2018-11-291-0/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'tq/branch-style-fix' into maintJunio C Hamano2018-11-211-2/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tq/branch-create-wo-branch-get' into maintJunio C Hamano2018-11-211-5/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/check-everything-connected-is-long-gone' into maintJunio C Hamano2018-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'en/double-semicolon-fix' into maintJunio C Hamano2018-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/void-check-attr' into maintJunio C Hamano2018-11-212-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/detect-truncated-zlib-input' into maintJunio C Hamano2018-11-211-4/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'md/exclude-promisor-objects-fix' into maintJunio C Hamano2018-11-213-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/shallow-and-fetch-prune' into maintJunio C Hamano2018-11-212-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/receive-deny-current-branch-fix' into maintJunio C Hamano2018-11-211-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/pack-objects-mutex-init-fix' into maintJunio C Hamano2018-11-211-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'en/status-multiple-renames-to-the-same-target-fix' into maintJunio C Hamano2018-11-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ds/commit-graph-with-grafts' into maintJunio C Hamano2018-11-212-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'en/update-ref-no-deref-stdin' into maintJunio C Hamano2018-11-211-11/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/remote-error-message-update' into maintJunio C Hamano2018-11-211-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/attr-pathspec-fix' into maintJunio C Hamano2018-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/trailer-fixes' into maintJunio C Hamano2018-11-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/rebase-stat-unrelated-fix'Junio C Hamano2018-12-011-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | rebase --stat: fix when rebasing to an unrelated historyJohannes Schindelin2018-11-301-6/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-reflog-action-fix'Junio C Hamano2018-12-011-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | rebase: fix GIT_REFLOG_ACTION regressionJohannes Schindelin2018-11-301-3/+26
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / format-patch: do not let its diff-options affect --range-diffJunio C Hamano2018-11-301-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/delta-islands'Junio C Hamano2018-11-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: fix off-by-one in delta-island tree-depth computationJeff King2018-11-211-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/builtin-rebase-perf-fix-err-fix'Junio C Hamano2018-11-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | rebase: warn about the correct tree's OIDJohannes Schindelin2018-11-211-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/print-size-t-with-uintmax-format'Junio C Hamano2018-11-195-14/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Upcast size_t variables to uintmax_t when printingTorsten Bögershausen2018-11-125-14/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/format-patch-cover-letter-stat-width'Junio C Hamano2018-11-191-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: respect --stat in cover letter's diffstatNguyễn Thái Ngọc Duy2018-11-131-2/+0
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ds/push-squelch-ambig-warning'Junio C Hamano2018-11-191-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: ignore ambiguous object warningsDerrick Stolee2018-11-071-0/+6
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /