Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | tests: stop testing `git rebase --preserve-merges` | Johannes Schindelin | 2021-09-07 | 17 | -764/+3 | |
| * | | | | | | | | | remote: warn about unhandled branch.<name>.rebase values | Johannes Schindelin | 2021-09-07 | 1 | -0/+3 | |
| * | | | | | | | | | t5520: do not use `pull.rebase=preserve` | Johannes Schindelin | 2021-09-07 | 1 | -3/+3 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'rs/mergesort' | Junio C Hamano | 2021-10-18 | 4 | -67/+473 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | test-mergesort: use repeatable random numbers | René Scharfe | 2021-10-08 | 1 | -2/+10 | |
| * | | | | | | | | | mergesort: use ranks stack | René Scharfe | 2021-10-01 | 1 | -55/+66 | |
| * | | | | | | | | | p0071: test performance of llist_mergesort() | René Scharfe | 2021-10-01 | 1 | -0/+11 | |
| * | | | | | | | | | p0071: measure sorting of already sorted and reversed files | René Scharfe | 2021-10-01 | 1 | -7/+22 | |
| * | | | | | | | | | test-mergesort: add unriffle_skewed mode | René Scharfe | 2021-10-01 | 1 | -0/+28 | |
| * | | | | | | | | | test-mergesort: add unriffle mode | René Scharfe | 2021-10-01 | 1 | -0/+29 | |
| * | | | | | | | | | test-mergesort: add generate subcommand | René Scharfe | 2021-10-01 | 1 | -1/+59 | |
| * | | | | | | | | | test-mergesort: add test subcommand | René Scharfe | 2021-10-01 | 2 | -1/+242 | |
| * | | | | | | | | | test-mergesort: add sort subcommand | René Scharfe | 2021-10-01 | 1 | -1/+8 | |
| * | | | | | | | | | test-mergesort: use strbuf_getline() | René Scharfe | 2021-10-01 | 1 | -4/+2 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Thirteenth batch | Junio C Hamano | 2021-10-14 | 1 | -0/+22 | |
* | | | | | | | | | Merge branch 'ja/doc-status-types-and-copies' | Junio C Hamano | 2021-10-13 | 2 | -11/+14 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Documentation/git-status: mention how to detect copies | Johannes Altmanninger | 2021-10-04 | 1 | -1/+1 | |
| * | | | | | | | | | Documentation/git-status: document porcelain status T (typechange) | Johannes Altmanninger | 2021-10-04 | 1 | -7/+10 | |
| * | | | | | | | | | Documentation/diff-format: state in which cases porcelain status is T | Johannes Altmanninger | 2021-10-04 | 1 | -1/+1 | |
| * | | | | | | | | | Documentation/git-status: remove impossible porcelain status DR and DC | Johannes Altmanninger | 2021-10-04 | 1 | -2/+2 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'ab/make-sparse-for-real' | Junio C Hamano | 2021-10-13 | 2 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Makefile: make the "sparse" target non-.PHONY | Ævar Arnfjörð Bjarmason | 2021-09-22 | 2 | -3/+7 | |
* | | | | | | | | | | Merge branch 'ab/align-parse-options-help' | Junio C Hamano | 2021-10-13 | 8 | -26/+132 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | parse-options: properly align continued usage output | Ævar Arnfjörð Bjarmason | 2021-09-22 | 1 | -12/+64 | |
| * | | | | | | | | | | git rev-parse --parseopt tests: add more usagestr tests | Ævar Arnfjörð Bjarmason | 2021-09-12 | 1 | -0/+54 | |
| * | | | | | | | | | | send-pack: properly use parse_options() API for usage string | Ævar Arnfjörð Bjarmason | 2021-09-12 | 2 | -6/+6 | |
| * | | | | | | | | | | parse-options API users: align usage output in C-strings | Ævar Arnfjörð Bjarmason | 2021-09-12 | 4 | -8/+8 | |
* | | | | | | | | | | | Merge branch 'ab/help-config-vars' | Junio C Hamano | 2021-10-13 | 7 | -68/+166 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | help: move column config discovery to help.c library | Ævar Arnfjörð Bjarmason | 2021-09-23 | 3 | -9/+16 | |
| * | | | | | | | | | | | help / completion: make "git help" do the hard work | Ævar Arnfjörð Bjarmason | 2021-09-23 | 3 | -27/+65 | |
| * | | | | | | | | | | | help tests: test --config-for-completion option & output | Ævar Arnfjörð Bjarmason | 2021-09-23 | 1 | -1/+16 | |
| * | | | | | | | | | | | help: simplify by moving to OPT_CMDMODE() | Ævar Arnfjörð Bjarmason | 2021-09-23 | 2 | -47/+40 | |
| * | | | | | | | | | | | help: correct logic error in combining --all and --guides | Ævar Arnfjörð Bjarmason | 2021-09-23 | 2 | -1/+10 | |
| * | | | | | | | | | | | help: correct logic error in combining --all and --config | Ævar Arnfjörð Bjarmason | 2021-09-23 | 3 | -10/+25 | |
| * | | | | | | | | | | | help tests: add test for --config output | Ævar Arnfjörð Bjarmason | 2021-09-23 | 1 | -0/+13 | |
| * | | | | | | | | | | | help: correct usage & behavior of "git help --guides" | Ævar Arnfjörð Bjarmason | 2021-09-23 | 3 | -7/+14 | |
| * | | | | | | | | | | | help: correct the usage string in -h and documentation | Ævar Arnfjörð Bjarmason | 2021-09-10 | 2 | -2/+3 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'jh/builtin-fsmonitor-part1' | Junio C Hamano | 2021-10-13 | 13 | -198/+587 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | t/helper/simple-ipc: convert test-simple-ipc to use start_bg_command | Jeff Hostetler | 2021-09-20 | 1 | -156/+43 | |
| * | | | | | | | | | | | run-command: create start_bg_command | Jeff Hostetler | 2021-09-20 | 2 | -0/+186 | |
| * | | | | | | | | | | | simple-ipc/ipc-win32: add Windows ACL to named pipe | Jeff Hostetler | 2021-09-20 | 1 | -11/+129 | |
| * | | | | | | | | | | | simple-ipc/ipc-win32: add trace2 debugging | Jeff Hostetler | 2021-09-20 | 1 | -1/+24 | |
| * | | | | | | | | | | | simple-ipc: move definition of ipc_active_state outside of ifdef | Carlo Marcelo Arenas Belón | 2021-09-20 | 1 | -7/+7 | |
| * | | | | | | | | | | | simple-ipc: preparations for supporting binary messages. | Jeff Hostetler | 2021-09-20 | 4 | -23/+46 | |
| * | | | | | | | | | | | trace2: add trace2_child_ready() to report on background children | Jeff Hostetler | 2021-09-20 | 7 | -0/+152 | |
* | | | | | | | | | | | | Merge branch 'ab/config-based-hooks-1' | Junio C Hamano | 2021-10-13 | 19 | -100/+127 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | hook-list.h: add a generated list of hooks, like config-list.h | Ævar Arnfjörð Bjarmason | 2021-09-27 | 5 | -37/+43 | |
| * | | | | | | | | | | | | hook.c users: use "hook_exists()" instead of "find_hook()" | Ævar Arnfjörð Bjarmason | 2021-09-27 | 4 | -4/+4 | |
| * | | | | | | | | | | | | hook.c: add a hook_exists() wrapper and use it in bugreport.c | Emily Shaffer | 2021-09-27 | 3 | -1/+11 | |
| * | | | | | | | | | | | | hook.[ch]: move find_hook() from run-command.c to hook.c | Ævar Arnfjörð Bjarmason | 2021-09-27 | 14 | -43/+59 |