summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | tests: stop testing `git rebase --preserve-merges`Johannes Schindelin2021-09-0717-764/+3
| * | | | | | | | | remote: warn about unhandled branch.<name>.rebase valuesJohannes Schindelin2021-09-071-0/+3
| * | | | | | | | | t5520: do not use `pull.rebase=preserve`Johannes Schindelin2021-09-071-3/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/mergesort'Junio C Hamano2021-10-184-67/+473
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-mergesort: use repeatable random numbersRené Scharfe2021-10-081-2/+10
| * | | | | | | | | mergesort: use ranks stackRené Scharfe2021-10-011-55/+66
| * | | | | | | | | p0071: test performance of llist_mergesort()René Scharfe2021-10-011-0/+11
| * | | | | | | | | p0071: measure sorting of already sorted and reversed filesRené Scharfe2021-10-011-7/+22
| * | | | | | | | | test-mergesort: add unriffle_skewed modeRené Scharfe2021-10-011-0/+28
| * | | | | | | | | test-mergesort: add unriffle modeRené Scharfe2021-10-011-0/+29
| * | | | | | | | | test-mergesort: add generate subcommandRené Scharfe2021-10-011-1/+59
| * | | | | | | | | test-mergesort: add test subcommandRené Scharfe2021-10-012-1/+242
| * | | | | | | | | test-mergesort: add sort subcommandRené Scharfe2021-10-011-1/+8
| * | | | | | | | | test-mergesort: use strbuf_getline()René Scharfe2021-10-011-4/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Thirteenth batchJunio C Hamano2021-10-141-0/+22
* | | | | | | | | Merge branch 'ja/doc-status-types-and-copies'Junio C Hamano2021-10-132-11/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/git-status: mention how to detect copiesJohannes Altmanninger2021-10-041-1/+1
| * | | | | | | | | Documentation/git-status: document porcelain status T (typechange)Johannes Altmanninger2021-10-041-7/+10
| * | | | | | | | | Documentation/diff-format: state in which cases porcelain status is TJohannes Altmanninger2021-10-041-1/+1
| * | | | | | | | | Documentation/git-status: remove impossible porcelain status DR and DCJohannes Altmanninger2021-10-041-2/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/make-sparse-for-real'Junio C Hamano2021-10-132-3/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: make the "sparse" target non-.PHONYÆvar Arnfjörð Bjarmason2021-09-222-3/+7
* | | | | | | | | | Merge branch 'ab/align-parse-options-help'Junio C Hamano2021-10-138-26/+132
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | parse-options: properly align continued usage outputÆvar Arnfjörð Bjarmason2021-09-221-12/+64
| * | | | | | | | | | git rev-parse --parseopt tests: add more usagestr testsÆvar Arnfjörð Bjarmason2021-09-121-0/+54
| * | | | | | | | | | send-pack: properly use parse_options() API for usage stringÆvar Arnfjörð Bjarmason2021-09-122-6/+6
| * | | | | | | | | | parse-options API users: align usage output in C-stringsÆvar Arnfjörð Bjarmason2021-09-124-8/+8
* | | | | | | | | | | Merge branch 'ab/help-config-vars'Junio C Hamano2021-10-137-68/+166
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | help: move column config discovery to help.c libraryÆvar Arnfjörð Bjarmason2021-09-233-9/+16
| * | | | | | | | | | | help / completion: make "git help" do the hard workÆvar Arnfjörð Bjarmason2021-09-233-27/+65
| * | | | | | | | | | | help tests: test --config-for-completion option & outputÆvar Arnfjörð Bjarmason2021-09-231-1/+16
| * | | | | | | | | | | help: simplify by moving to OPT_CMDMODE()Ævar Arnfjörð Bjarmason2021-09-232-47/+40
| * | | | | | | | | | | help: correct logic error in combining --all and --guidesÆvar Arnfjörð Bjarmason2021-09-232-1/+10
| * | | | | | | | | | | help: correct logic error in combining --all and --configÆvar Arnfjörð Bjarmason2021-09-233-10/+25
| * | | | | | | | | | | help tests: add test for --config outputÆvar Arnfjörð Bjarmason2021-09-231-0/+13
| * | | | | | | | | | | help: correct usage & behavior of "git help --guides"Ævar Arnfjörð Bjarmason2021-09-233-7/+14
| * | | | | | | | | | | help: correct the usage string in -h and documentationÆvar Arnfjörð Bjarmason2021-09-102-2/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jh/builtin-fsmonitor-part1'Junio C Hamano2021-10-1313-198/+587
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t/helper/simple-ipc: convert test-simple-ipc to use start_bg_commandJeff Hostetler2021-09-201-156/+43
| * | | | | | | | | | | run-command: create start_bg_commandJeff Hostetler2021-09-202-0/+186
| * | | | | | | | | | | simple-ipc/ipc-win32: add Windows ACL to named pipeJeff Hostetler2021-09-201-11/+129
| * | | | | | | | | | | simple-ipc/ipc-win32: add trace2 debuggingJeff Hostetler2021-09-201-1/+24
| * | | | | | | | | | | simple-ipc: move definition of ipc_active_state outside of ifdefCarlo Marcelo Arenas Belón2021-09-201-7/+7
| * | | | | | | | | | | simple-ipc: preparations for supporting binary messages.Jeff Hostetler2021-09-204-23/+46
| * | | | | | | | | | | trace2: add trace2_child_ready() to report on background childrenJeff Hostetler2021-09-207-0/+152
* | | | | | | | | | | | Merge branch 'ab/config-based-hooks-1'Junio C Hamano2021-10-1319-100/+127
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | hook-list.h: add a generated list of hooks, like config-list.hÆvar Arnfjörð Bjarmason2021-09-275-37/+43
| * | | | | | | | | | | | hook.c users: use "hook_exists()" instead of "find_hook()"Ævar Arnfjörð Bjarmason2021-09-274-4/+4
| * | | | | | | | | | | | hook.c: add a hook_exists() wrapper and use it in bugreport.cEmily Shaffer2021-09-273-1/+11
| * | | | | | | | | | | | hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason2021-09-2714-43/+59