summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* branch: add flags and config to inherit trackingJosh Steadmon2021-12-2116-23/+205
* branch: accept multiple upstream branches for trackingJosh Steadmon2021-12-212-43/+106
* Thirteenth batchJunio C Hamano2021-10-141-0/+22
* Merge branch 'ja/doc-status-types-and-copies'Junio C Hamano2021-10-142-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-142-3/+7
|\ \
| * | Makefile: make the "sparse" target non-.PHONYÆvar Arnfjörð Bjarmason2021-09-232-3/+7
* | | Merge branch 'ab/align-parse-options-help'Junio C Hamano2021-10-148-26/+132
|\ \ \
| * | | parse-options: properly align continued usage outputÆvar Arnfjörð Bjarmason2021-09-231-12/+64
| * | | git rev-parse --parseopt tests: add more usagestr testsÆvar Arnfjörð Bjarmason2021-09-131-0/+54
| * | | send-pack: properly use parse_options() API for usage stringÆvar Arnfjörð Bjarmason2021-09-132-6/+6
| * | | parse-options API users: align usage output in C-stringsÆvar Arnfjörð Bjarmason2021-09-134-8/+8
* | | | Merge branch 'ab/help-config-vars'Junio C Hamano2021-10-147-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-112-2/+3
| |/ / /
* | | | Merge branch 'jh/builtin-fsmonitor-part1'Junio C Hamano2021-10-1413-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-1419-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
| * | | | | Makefile: remove an out-of-date commentÆvar Arnfjörð Bjarmason2021-09-241-7/+0
| * | | | | Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)Ævar Arnfjörð Bjarmason2021-09-241-3/+2
| * | | | | Makefile: stop hardcoding {command,config}-list.hÆvar Arnfjörð Bjarmason2021-09-243-6/+8
| * | | | | Makefile: mark "check" target as .PHONYÆvar Arnfjörð Bjarmason2021-09-241-0/+1
* | | | | | Merge branch 'ab/lib-subtest'Junio C Hamano2021-10-142-330/+213
|\ \ \ \ \ \
| * | | | | | test-lib tests: get rid of copy/pasted mock test codeÆvar Arnfjörð Bjarmason2021-09-231-168/+60
| * | | | | | test-lib tests: assert 1 exit code, not non-zeroÆvar Arnfjörð Bjarmason2021-09-231-12/+9
| * | | | | | test-lib tests: refactor common part of check_sub_test_lib_test*()Ævar Arnfjörð Bjarmason2021-09-231-5/+9
| * | | | | | test-lib tests: avoid subshell for "test_cmp" for readabilityÆvar Arnfjörð Bjarmason2021-09-231-13/+7
| * | | | | | test-lib tests: don't provide a description for the sub-testsÆvar Arnfjörð Bjarmason2021-09-232-88/+66
| * | | | | | test-lib tests: split up "write and run" into two functionsÆvar Arnfjörð Bjarmason2021-09-232-49/+67
| * | | | | | test-lib tests: move "run_sub_test" to a new lib-subtest.shÆvar Arnfjörð Bjarmason2021-07-222-87/+87