summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-10-04git-gui: support for diff3 conflict styleBert Wesarg2-1/+20
2019-10-03range-diff: internally force `diff.noprefix=true`Johannes Schindelin2-1/+6
2019-10-03ci: run `hdr-check` as part of the `Static Analysis` jobJohannes Schindelin3-2/+6
2019-10-03push: add trace2 instrumentationJosh Steadmon2-2/+14
2019-10-03fetch: add trace2 instrumentationJosh Steadmon2-8/+27
2019-10-03git_mkstemps_mode(): replace magic numbers with computed valueJeff King1-5/+7
2019-10-03git-gui: use existing interface to query a path's attributeBert Wesarg1-14/+1
2019-10-03Merge branch 'js/git-bash-if-available'Pratyush Yadav1-2/+10
2019-10-02commit-graph: emit trace2 cmd_mode for each sub-commandGarima Singh1-0/+6
2019-10-02t0061: fix test for argv[0] with spaces (MINGW only)Alexandr Miloslavskiy1-4/+17
2019-10-02wrapper: use a loop instead of repetitive statementsAlex Henrie1-6/+5
2019-10-02diffcore-break: use a goto instead of a redundant if statementAlex Henrie1-6/+6
2019-10-02commit-graph: remove a duplicate assignmentAlex Henrie1-2/+3
2019-10-02shallow.c: don't free unallocated slabsAli Utku Selen1-0/+2
2019-10-02merge-recursive: fix the diff3 common ancestor label for virtual commitsElijah Newren2-1/+19
2019-10-02promisor-remote: skip move_to_tail when no-opEmily Shaffer2-0/+16
2019-10-02diffcore_rename(): use a stable sortJohannes Schindelin1-1/+1
2019-10-02Move git_sort(), a stable sort, into into libgit.aJohannes Schindelin4-15/+13
2019-10-02dir: special case check for the possibility that pathspec is NULLElijah Newren2-3/+25
2019-10-01git-gui (Windows): use git-bash.exe if it is availableThomas Klaeger1-2/+10
2019-09-30Fourth batchJunio C Hamano1-2/+69
2019-09-30Merge branch 'ds/commit-graph-on-fetch'Junio C Hamano6-0/+51
2019-09-30Merge branch 'bw/rebase-autostash-keep-current-branch'Junio C Hamano2-16/+9
2019-09-30Merge branch 'ds/include-exclude'Junio C Hamano12-251/+284
2019-09-30Merge branch 'jh/trace2-pretty-output'Junio C Hamano6-55/+97
2019-09-30Merge branch 'dl/rebase-i-keep-base'Junio C Hamano9-28/+360
2019-09-30Merge branch 'sg/clean-nested-repo-with-ignored'Junio C Hamano1-0/+22
2019-09-30Merge branch 'dl/complete-cherry-pick-revert-skip'Junio C Hamano3-2/+14
2019-09-30Merge branch 'dl/use-sq-from-test-lib'Junio C Hamano11-61/+51
2019-09-30Merge branch 'jk/misc-uninitialized-fixes'Junio C Hamano9-40/+38
2019-09-30Merge branch 'sg/git-test-boolean'Junio C Hamano2-2/+2
2019-09-30Merge branch 'rs/get-tagged-oid'Junio C Hamano9-13/+18
2019-09-30Merge branch 'en/filter-branch-deprecation'Junio C Hamano11-64/+292
2019-09-30Merge branch 'en/merge-options-ff-and-friends'Junio C Hamano1-12/+16
2019-09-30Merge branch 'tg/push-all-in-mirror-forbidden'Junio C Hamano2-33/+46
2019-09-30Merge branch 'dt/remote-helper-doc-re-lock-option'Junio C Hamano1-3/+7
2019-09-30Merge branch 'rs/help-unknown-ref-does-not-return'Junio C Hamano2-2/+3
2019-09-30Merge branch 'nd/switch-and-restore'Junio C Hamano1-0/+9
2019-09-30Merge branch 'tb/file-url-to-unc-path'Junio C Hamano2-2/+15
2019-09-30Merge branch 'js/gitdir-at-unc-root'Junio C Hamano1-2/+8
2019-09-30Merge branch 'ar/mingw-run-external-with-non-ascii-path'Junio C Hamano1-4/+11
2019-09-30Merge branch 'rs/parse-tree-indirect'Junio C Hamano1-15/+3
2019-09-30Merge branch 'jk/fast-import-history-bugfix'Junio C Hamano1-5/+6
2019-09-30Merge branch 'mh/notes-duplicate-entries'Junio C Hamano1-2/+4
2019-09-30Merge branch 'tb/banned-vsprintf-namefix'Junio C Hamano1-1/+1
2019-09-30Merge branch 'mh/release-commit-memory-fix'Junio C Hamano1-1/+1
2019-09-30Merge branch 'mh/http-urlmatch-cleanup'Junio C Hamano1-0/+1
2019-09-30Merge branch 'rs/strbuf-detach'Junio C Hamano2-5/+3
2019-09-30Merge branch 'rs/trace2-dst-warning'Junio C Hamano1-7/+2
2019-09-30Merge branch 'dl/format-patch-doc-test-cleanup'Junio C Hamano3-417/+421