summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge branch 'es/pretty-describe-more' into seenseenJunio C Hamano2021-10-29-13/+49
|\
| * pretty: add abbrev option to %(describe)Eli Schwartz2021-10-23-1/+13
| * pretty: add tag option to %(describe)Eli Schwartz2021-10-23-9/+33
| * pretty.c: rename describe options variable to more descriptive nameEli Schwartz2021-10-23-4/+4
* | Merge branch 'gc/remote-with-fewer-static-global-variables' into seenJunio C Hamano2021-10-29-141/+405
|\ \
| * | remote: add struct repository parameter to external functionsGlen Choo2021-10-28-56/+109
| * | remote: die if branch is not found in repositoryGlen Choo2021-10-28-6/+69
| * | remote: remove the_repository->remote_state from static methodsGlen Choo2021-10-28-25/+71
| * | remote: use remote_state parameter internallyGlen Choo2021-10-28-86/+75
| * | remote: move static variables into per-repository structGlen Choo2021-10-28-67/+170
| * | t5516: add test case for pushing remote refspecsGlen Choo2021-10-28-0/+9
* | | Merge branch 'jh/builtin-fsmonitor-part2' into seenJunio C Hamano2021-10-29-98/+4247
|\ \ \
| * | | t7527: test status with untracked-cache and fsmonitor--daemonJeff Hostetler2021-10-21-0/+96
| * | | fsmonitor: force update index after large responsesJeff Hostetler2021-10-21-1/+56
| * | | fsmonitor--daemon: use a cookie file to sync with file systemJeff Hostetler2021-10-21-1/+232
| * | | fsmonitor--daemon: periodically truncate list of modified filesJeff Hostetler2021-10-21-0/+88
| * | | t/perf/p7519: add fsmonitor--daemon test casesJeff Hostetler2021-10-21-3/+34
| * | | t/perf/p7519: speed up test on WindowsJeff Hostetler2021-10-21-8/+16
| * | | t/helper/test-chmtime: skip directories on WindowsJeff Hostetler2021-10-21-0/+15
| * | | t/perf: avoid copying builtin fsmonitor files into test repoJeff Hostetler2021-10-21-1/+1
| * | | t7527: create test for fsmonitor--daemonJeff Hostetler2021-10-21-0/+511
| * | | t/helper/fsmonitor-client: create IPC client to talk to FSMonitor DaemonJeff Hostetler2021-10-21-0/+124
| * | | help: include fsmonitor--daemon feature flag in version infoJeff Hostetler2021-10-21-0/+10
| * | | fsmonitor--daemon: implement handle_client callbackJeff Hostetler2021-10-21-2/+310
| * | | compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOSJeff Hostetler2021-10-21-1/+381
| * | | compat/fsmonitor/fsm-listen-darwin: add macos header files for FSEventJeff Hostetler2021-10-21-0/+96
| * | | compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on WindowsJeff Hostetler2021-10-21-0/+565
| * | | fsmonitor--daemon: create token-based changed path cacheJeff Hostetler2021-10-21-2/+268
| * | | fsmonitor--daemon: define token-idsJeff Hostetler2021-10-21-1/+115
| * | | fsmonitor--daemon: add pathname classificationJeff Hostetler2021-10-21-0/+142
| * | | fsmonitor--daemon: implement 'start' commandJeff Hostetler2021-10-21-2/+105
| * | | fsmonitor--daemon: implement 'run' commandJeff Hostetler2021-10-21-1/+246
| * | | compat/fsmonitor/fsm-listen-darwin: stub in backend for DarwinJeff Hostetler2021-10-21-0/+33
| * | | compat/fsmonitor/fsm-listen-win32: stub in backend for WindowsJeff Hostetler2021-10-21-0/+101
| * | | fsmonitor--daemon: implement 'stop' and 'status' commandsJeff Hostetler2021-10-21-0/+51
| * | | fsmonitor--daemon: add a built-in fsmonitor daemonJeff Hostetler2021-10-21-0/+50
| * | | fsmonitor: document builtin fsmonitorJeff Hostetler2021-10-21-27/+134
| * | | fsmonitor: use IPC to query the builtin FSMonitor daemonJeff Hostetler2021-10-21-2/+32
| * | | fsmonitor: config settings are repository-specificJeff Hostetler2021-10-21-51/+192
| * | | fsmonitor-ipc: create client routines for git-fsmonitor--daemonJeff Hostetler2021-10-21-0/+225
| * | | fsmonitor: enhance existing commentsJeff Hostetler2021-10-21-7/+30
| | |/ | |/|
* | | Merge branch 'ab/config-based-hooks-2' into seenJunio C Hamano2021-10-29-169/+550
|\ \ \
| * | | run-command: remove old run_hook_{le,ve}() hook APIEmily Shaffer2021-10-20-48/+0
| * | | receive-pack: convert push-to-checkout hook to hook.hEmily Shaffer2021-10-20-2/+5
| * | | read-cache: convert post-index-change to use hook.hEmily Shaffer2021-10-20-5/+9
| * | | commit: convert {pre-commit,prepare-commit-msg} hook to hook.hEmily Shaffer2021-10-20-7/+8
| * | | git-p4: use 'git hook' to run hooksEmily Shaffer2021-10-20-64/+6
| * | | send-email: use 'git hook run' for 'sendemail-validate'Emily Shaffer2021-10-20-10/+16
| * | | git hook run: add an --ignore-missing flagÆvar Arnfjörð Bjarmason2021-10-20-2/+20
| * | | merge: convert post-merge to use hook.hEmily Shaffer2021-10-20-1/+3