Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | t7610: add mergetool --gui tests | Denton Liu | 2019-04-25 | 1 | -0/+22 | |
| * | | | | | | | | t7610: unsuppress output | Denton Liu | 2019-04-25 | 1 | -61/+61 | |
* | | | | | | | | | Merge branch 'mh/http-fread-api-fix' | Junio C Hamano | 2019-05-19 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Make fread/fwrite-like functions in http.c more like fread/fwrite. | Mike Hommey | 2019-05-08 | 1 | -6/+6 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'js/t6500-use-windows-pid-on-mingw' | Junio C Hamano | 2019-05-19 | 1 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | t6500(mingw): use the Windows PID of the shell | Johannes Schindelin | 2019-05-08 | 1 | -1/+9 | |
* | | | | | | | | | | Merge branch 'jk/apache-lsan' | Junio C Hamano | 2019-05-19 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | t/lib-httpd: pass LSAN_OPTIONS through apache | Jeff King | 2019-05-08 | 1 | -0/+1 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'nd/parse-options-aliases' | Junio C Hamano | 2019-05-19 | 5 | -10/+164 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | parse-options: don't emit "ambiguous option" for aliases | Nguyễn Thái Ngọc Duy | 2019-05-07 | 5 | -10/+164 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'dl/branch-from-3dot-merge-base' | Junio C Hamano | 2019-05-19 | 5 | -32/+50 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | branch: make create_branch accept a merge base rev | Denton Liu | 2019-05-07 | 5 | -6/+33 | |
| * | | | | | | | | | | t2018: cleanup in current test | Denton Liu | 2019-05-07 | 1 | -26/+17 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'js/commit-graph-parse-leakfix' | Junio C Hamano | 2019-05-19 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | commit-graph: fix memory leak | Josh Steadmon | 2019-05-07 | 1 | -1/+3 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jk/cocci-batch' | Junio C Hamano | 2019-05-19 | 1 | -7/+12 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | coccicheck: make batch size of 0 mean "unlimited" | Jeff King | 2019-05-08 | 1 | -1/+7 | |
| * | | | | | | | | | | coccicheck: optionally batch spatch invocations | Jeff King | 2019-05-07 | 1 | -7/+6 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'ab/perf-installed-fix' | Junio C Hamano | 2019-05-19 | 4 | -27/+53 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | perf-lib.sh: forbid the use of GIT_TEST_INSTALLED | Ævar Arnfjörð Bjarmason | 2019-05-08 | 2 | -0/+13 | |
| * | | | | | | | | | | perf tests: add "bindir" prefix to git tree test results | Ævar Arnfjörð Bjarmason | 2019-05-08 | 2 | -2/+4 | |
| * | | | | | | | | | | perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh | Ævar Arnfjörð Bjarmason | 2019-05-08 | 3 | -32/+38 | |
| * | | | | | | | | | | perf-lib.sh: make "./run <revisions>" use the correct gits | Ævar Arnfjörð Bjarmason | 2019-05-08 | 2 | -2/+10 | |
| * | | | | | | | | | | perf aggregate: remove GIT_TEST_INSTALLED from --codespeed | Ævar Arnfjörð Bjarmason | 2019-05-08 | 1 | -3/+0 | |
| * | | | | | | | | | | perf README: correct docs for 3c8f12c96c regression | Ævar Arnfjörð Bjarmason | 2019-05-08 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'id/windows-dep-aslr' | Junio C Hamano | 2019-05-19 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | mingw: enable DEP and ASLR | İsmail Dönmez | 2019-05-13 | 1 | -0/+6 | |
| * | | | | | | | | | | | mingw: do not let ld strip relocations | İsmail Dönmez | 2019-05-13 | 1 | -0/+2 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'ab/trace2-typofix' | Junio C Hamano | 2019-05-19 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | trace2: fix up a missing "leave" entry point | Ævar Arnfjörð Bjarmason | 2019-05-13 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge branch 'nd/submodule-helper-incomplete-line-fix' | Junio C Hamano | 2019-05-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | submodule--helper: add a missing \n | Nguyễn Thái Ngọc Duy | 2019-05-08 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'cw/diff-highlight' | Junio C Hamano | 2019-05-19 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | diff-highlight: use correct /dev/null for UNIX and Windows | Chris. Webster | 2019-05-09 | 1 | -1/+6 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'dl/warn-tagging-a-tag' | Junio C Hamano | 2019-05-19 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | tag: fix typo in nested tagging hint | Denton Liu | 2019-05-09 | 2 | -2/+2 | |
* | | | | | | | | | | | | Git 2.22-rc0v2.22.0-rc0 | Junio C Hamano | 2019-05-13 | 2 | -1/+40 | |
* | | | | | | | | | | | | Merge branch 'jh/trace2' | Junio C Hamano | 2019-05-13 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | trace2: fix up a missing "leave" entry point | Ævar Arnfjörð Bjarmason | 2019-05-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | trace2: fix incorrect function pointer check | Josh Steadmon | 2019-04-26 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'cc/access-on-aix-workaround' | Junio C Hamano | 2019-05-13 | 5 | -2/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git-compat-util: work around for access(X_OK) under root | Clément Chigot | 2019-04-25 | 5 | -2/+52 | |
* | | | | | | | | | | | | | | Merge branch 'pw/clean-sequencer-state-upon-final-commit' | Junio C Hamano | 2019-05-13 | 7 | -9/+201 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | fix cherry-pick/revert status after commit | Phillip Wood | 2019-04-17 | 4 | -5/+107 | |
| * | | | | | | | | | | | | | | commit/reset: try to clean up sequencer state | Phillip Wood | 2019-04-17 | 5 | -4/+94 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'pw/rebase-i-internal' | Junio C Hamano | 2019-05-13 | 7 | -511/+532 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | rebase -i: run without forking rebase--interactive | Phillip Wood | 2019-04-19 | 1 | -135/+86 | |
| * | | | | | | | | | | | | | | rebase: use a common action enum | Phillip Wood | 2019-04-19 | 1 | -43/+48 | |
| * | | | | | | | | | | | | | | rebase -i: use struct rebase_options in do_interactive_rebase() | Phillip Wood | 2019-04-19 | 1 | -33/+36 | |
| * | | | | | | | | | | | | | | rebase -i: use struct rebase_options to parse args | Phillip Wood | 2019-04-19 | 1 | -91/+112 |