summaryrefslogtreecommitdiffstats
path: root/contrib (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/zdiff3'Junio C Hamano2021-12-151-3/+3
|\
| * xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood2021-12-011-3/+3
* | Merge branch 'hn/reftable'Junio C Hamano2021-12-152-3/+22
|\ \
| * | reftable: utility functionsHan-Wen Nienhuys2021-10-082-3/+22
* | | Merge branch 'yn/complete-date-format-options'Junio C Hamano2021-12-101-1/+1
|\ \ \
| * | | completion: add human and auto: date formatYoichi Nakayama2021-11-261-1/+1
* | | | Merge branch 'bc/require-c99'Junio C Hamano2021-12-101-1/+1
|\ \ \ \
| * | | | git-compat-util: add a test balloon for C99 supportbrian m. carlson2021-12-011-1/+1
* | | | | Merge branch 'jk/jump-merge-with-pathspec'Junio C Hamano2021-12-102-1/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | git-jump: pass "merge" arguments to ls-filesJeff King2021-11-092-1/+4
| | |/ / | |/| |
* | | | Merge branch 'ab/sh-retire-helper-functions'Junio C Hamano2021-11-301-1/+0
|\ \ \ \
| * | | | git-sh-setup: remove "sane_grep", it's not needed anymoreÆvar Arnfjörð Bjarmason2021-10-221-1/+0
* | | | | Merge branch 'tp/send-email-completion'Junio C Hamano2021-11-301-10/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | send-email: programmatically generate bash completionsThiago Perrotta2021-10-281-10/+1
* | | | | Merge branch 're/completion-fix-test-equality'Junio C Hamano2021-10-301-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | completion: fix incorrect bash/zsh string equality checkRobert Estelle2021-10-281-1/+1
| | |/ / | |/| |
| * | | Merge branch 'rs/xopen-reports-open-failures' into maintJunio C Hamano2021-10-121-0/+16
| |\ \ \
| * \ \ \ Merge branch 'ti/tcsh-completion-regression-fix' into maintJunio C Hamano2021-10-121-2/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'fc/completion-updates' into maintJunio C Hamano2021-10-121-7/+7
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-191-1/+1
|\ \ \ \ \ \
| * | | | | | pull: remove support for `--rebase=preserve`Johannes Schindelin2021-09-081-1/+1
| |/ / / / /
* | | | | | Merge branch 'ab/help-config-vars'Junio C Hamano2021-10-141-11/+10
|\ \ \ \ \ \
| * | | | | | help / completion: make "git help" do the hard workÆvar Arnfjörð Bjarmason2021-09-231-11/+10
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ab/config-based-hooks-1'Junio C Hamano2021-10-141-0/+7
|\ \ \ \ \ \
| * | | | | | hook-list.h: add a generated list of hooks, like config-list.hÆvar Arnfjörð Bjarmason2021-09-271-0/+7
* | | | | | | Merge branch 'en/removing-untracked-fixes'Junio C Hamano2021-10-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Comment important codepaths regarding nuking untracked files/dirsElijah Newren2021-09-271-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | *.[ch] *_INIT macros: use { 0 } for a "zero out" idiomÆvar Arnfjörð Bjarmason2021-09-272-2/+2
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'rs/use-xopen-in-index-pack'Junio C Hamano2021-09-231-5/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | index-pack: use xopen in init_threadRené Scharfe2021-09-101-5/+8
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs/xopen-reports-open-failures'Junio C Hamano2021-09-081-0/+16
|\| | | |
| * | | | use xopen() to handle fatal open(2) failuresRené Scharfe2021-08-251-0/+16
| |/ / /
* | | | Merge branch 'ti/tcsh-completion-regression-fix'Junio C Hamano2021-09-031-2/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | completion: tcsh: Fix regression by drop of wrapper functionsTakashi Iwai2021-08-181-2/+3
* | | | Merge branch 'fc/completion-updates'Junio C Hamano2021-09-031-7/+7
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | completion: bash: add correct suffix in variablesFelipe Contreras2021-08-181-3/+3
| * | completion: bash: fix for multiple dash commandsFelipe Contreras2021-08-181-1/+1
| * | completion: bash: fix for suboptions with valueFelipe Contreras2021-08-181-1/+1
| * | completion: bash: fix prefix detection in branch.*Felipe Contreras2021-08-181-2/+2
* | | Merge branch 'ab/attribute-format'Junio C Hamano2021-07-282-0/+2
|\ \ \
| * | | *.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason2021-07-142-0/+2
* | | | Merge branch 'js/gfw-system-config-loc-fix'Junio C Hamano2021-07-171-4/+7
|\ \ \ \
| * | | | cmake(windows): set correct path to the system Git configDennis Ameling2021-06-291-4/+7
| | |/ / | |/| |
* | | | Merge branch 'mr/cmake'Junio C Hamano2021-07-141-9/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | cmake: add warning for ignored MSGFMT_EXEMatthew Rogers2021-06-111-8/+12
| * | | cmake: create compile_commands.json by defaultMatthew Rogers2021-06-111-0/+4
| * | | cmake: add knob to disable vcpkgMatthew Rogers2021-06-111-4/+15
* | | | Merge branch 'ar/test-code-cleanup'Junio C Hamano2021-07-082-3/+3
|\ \ \ \
| * | | | t: fix whitespace around &&Andrei Rybak2021-06-082-3/+3
| | |/ / | |/| |
* | | | Merge branch 'fw/complete-cmd-idx-fix'Junio C Hamano2021-07-081-0/+1
|\ \ \ \