summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | t7610: add mergetool --gui testsDenton Liu2019-04-251-0/+22
| * | | | | | | | t7610: unsuppress outputDenton Liu2019-04-251-61/+61
* | | | | | | | | Merge branch 'mh/http-fread-api-fix'Junio C Hamano2019-05-191-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make fread/fwrite-like functions in http.c more like fread/fwrite.Mike Hommey2019-05-081-6/+6
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/t6500-use-windows-pid-on-mingw'Junio C Hamano2019-05-191-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t6500(mingw): use the Windows PID of the shellJohannes Schindelin2019-05-081-1/+9
* | | | | | | | | | Merge branch 'jk/apache-lsan'Junio C Hamano2019-05-191-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/lib-httpd: pass LSAN_OPTIONS through apacheJeff King2019-05-081-0/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/parse-options-aliases'Junio C Hamano2019-05-195-10/+164
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | parse-options: don't emit "ambiguous option" for aliasesNguyễn Thái Ngọc Duy2019-05-075-10/+164
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dl/branch-from-3dot-merge-base'Junio C Hamano2019-05-195-32/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch: make create_branch accept a merge base revDenton Liu2019-05-075-6/+33
| * | | | | | | | | | t2018: cleanup in current testDenton Liu2019-05-071-26/+17
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/commit-graph-parse-leakfix'Junio C Hamano2019-05-191-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit-graph: fix memory leakJosh Steadmon2019-05-071-1/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/cocci-batch'Junio C Hamano2019-05-191-7/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | coccicheck: make batch size of 0 mean "unlimited"Jeff King2019-05-081-1/+7
| * | | | | | | | | | coccicheck: optionally batch spatch invocationsJeff King2019-05-071-7/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ab/perf-installed-fix'Junio C Hamano2019-05-194-27/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | perf-lib.sh: forbid the use of GIT_TEST_INSTALLEDÆvar Arnfjörð Bjarmason2019-05-082-0/+13
| * | | | | | | | | | perf tests: add "bindir" prefix to git tree test resultsÆvar Arnfjörð Bjarmason2019-05-082-2/+4
| * | | | | | | | | | perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.shÆvar Arnfjörð Bjarmason2019-05-083-32/+38
| * | | | | | | | | | perf-lib.sh: make "./run <revisions>" use the correct gitsÆvar Arnfjörð Bjarmason2019-05-082-2/+10
| * | | | | | | | | | perf aggregate: remove GIT_TEST_INSTALLED from --codespeedÆvar Arnfjörð Bjarmason2019-05-081-3/+0
| * | | | | | | | | | perf README: correct docs for 3c8f12c96c regressionÆvar Arnfjörð Bjarmason2019-05-081-1/+1
* | | | | | | | | | | Merge branch 'id/windows-dep-aslr'Junio C Hamano2019-05-191-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mingw: enable DEP and ASLRİsmail Dönmez2019-05-131-0/+6
| * | | | | | | | | | | mingw: do not let ld strip relocationsİsmail Dönmez2019-05-131-0/+2
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ab/trace2-typofix'Junio C Hamano2019-05-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | trace2: fix up a missing "leave" entry pointÆvar Arnfjörð Bjarmason2019-05-131-1/+1
* | | | | | | | | | | | Merge branch 'nd/submodule-helper-incomplete-line-fix'Junio C Hamano2019-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodule--helper: add a missing \nNguyễn Thái Ngọc Duy2019-05-081-1/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'cw/diff-highlight'Junio C Hamano2019-05-191-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff-highlight: use correct /dev/null for UNIX and WindowsChris. Webster2019-05-091-1/+6
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'dl/warn-tagging-a-tag'Junio C Hamano2019-05-192-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | tag: fix typo in nested tagging hintDenton Liu2019-05-092-2/+2
* | | | | | | | | | | | Git 2.22-rc0v2.22.0-rc0Junio C Hamano2019-05-132-1/+40
* | | | | | | | | | | | Merge branch 'jh/trace2'Junio C Hamano2019-05-132-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | trace2: fix up a missing "leave" entry pointÆvar Arnfjörð Bjarmason2019-05-101-1/+1
| * | | | | | | | | | | | trace2: fix incorrect function pointer checkJosh Steadmon2019-04-261-1/+1
* | | | | | | | | | | | | Merge branch 'cc/access-on-aix-workaround'Junio C Hamano2019-05-135-2/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-compat-util: work around for access(X_OK) under rootClément Chigot2019-04-255-2/+52
* | | | | | | | | | | | | | Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano2019-05-137-9/+201
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix cherry-pick/revert status after commitPhillip Wood2019-04-174-5/+107
| * | | | | | | | | | | | | | commit/reset: try to clean up sequencer statePhillip Wood2019-04-175-4/+94
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'pw/rebase-i-internal'Junio C Hamano2019-05-137-511/+532
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase -i: run without forking rebase--interactivePhillip Wood2019-04-191-135/+86
| * | | | | | | | | | | | | | rebase: use a common action enumPhillip Wood2019-04-191-43/+48
| * | | | | | | | | | | | | | rebase -i: use struct rebase_options in do_interactive_rebase()Phillip Wood2019-04-191-33/+36
| * | | | | | | | | | | | | | rebase -i: use struct rebase_options to parse argsPhillip Wood2019-04-191-91/+112