summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-03-13doc: describe mergetool configuration in git-mergetool(1)Libravatar Jonathan Nieder1-0/+4
2021-03-13mergetool: do not enable hideResolved by defaultLibravatar Jonathan Nieder2-8/+3
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagLibravatar Seth House3-1/+44
2021-02-09mergetool: break setup_tool out into separate initialization functionLibravatar Seth House4-3/+16
2021-02-09mergetool: add hideResolved configurationLibravatar Seth House3-0/+42
2020-12-18Git 2.30-rc1Libravatar Junio C Hamano2-1/+5
2020-12-18Merge branch 'jc/diff-I-status-fix'Libravatar Junio C Hamano2-1/+26
2020-12-18Merge branch 'es/perf-export-fix'Libravatar Junio C Hamano1-2/+7
2020-12-18Merge branch 'rb/nonstop-config-mak-uname-update'Libravatar Junio C Hamano1-4/+0
2020-12-18Merge branch 'ab/unreachable-break'Libravatar Junio C Hamano2-3/+0
2020-12-18Merge branch 'jc/strmap-remove-typefix'Libravatar Junio C Hamano1-2/+2
2020-12-18Merge branch 'jc/compat-util-setitimer-fix'Libravatar Junio C Hamano1-1/+1
2020-12-18Merge branch 'dd/doc-p4-requirements-update'Libravatar Junio C Hamano2-3/+2
2020-12-18Merge branch 'js/init-defaultbranch-advice'Libravatar Junio C Hamano10-20/+61
2020-12-18Merge https://github.com/prati0100/git-guiLibravatar Junio C Hamano6-1397/+1711
2020-12-19Merge branch 'sh/inactive-background'Libravatar Pratyush Yadav2-16/+37
2020-12-19git-gui: use gray background for inactive text widgetsLibravatar Stefan Haller2-16/+37
2020-12-17Another batch before 2.30-rc1Libravatar Junio C Hamano1-0/+2
2020-12-17Merge branch 'jh/index-v2-doc-on-fsmn'Libravatar Junio C Hamano1-2/+8
2020-12-17Merge branch 'jb/midx-doc-update'Libravatar Junio C Hamano1-4/+0
2020-12-17Merge branch 'rj/make-clean'Libravatar Junio C Hamano3-8/+15
2020-12-17Merge branch 'js/t7064-master-to-initial'Libravatar Junio C Hamano1-51/+52
2020-12-17Merge branch 'js/t6300-hardcode-main'Libravatar Junio C Hamano1-88/+90
2020-12-17Merge branch 'jk/oid-array-cleanup'Libravatar Junio C Hamano6-199/+157
2020-12-17Merge branch 'tb/partial-clone-filters-fix'Libravatar Junio C Hamano3-6/+21
2020-12-17Merge branch 'js/t7900-protect-pwd-in-config-get'Libravatar Junio C Hamano1-2/+2
2020-12-18Merge branch 'st/selected-text-colors'Libravatar Pratyush Yadav1-2/+4
2020-12-18git-gui: Fix selected text colorsLibravatar Serg Tereshchenko1-2/+4
2020-12-18Merge branch 'rj/clean-speedup'Libravatar Pratyush Yadav1-0/+2
2020-12-18Makefile: conditionally include GIT-VERSION-FILELibravatar Ramsay Jones1-0/+2
2020-12-18Merge branch 'sh/macos-labels'Libravatar Pratyush Yadav1-2/+2
2020-12-18git-gui: fix colored label backgrounds when using themed widgetsLibravatar Stefan Haller1-2/+2
2020-12-16config.mak.uname: remove old NonStop compatibility settingsLibravatar Randall S. Becker1-4/+0
2020-12-16diff: correct interaction between --exit-code and -I<pattern>Libravatar Junio C Hamano2-1/+26
2020-12-16t/perf: fix test_export() failure with BSD `sed`Libravatar Eric Sunshine1-2/+7
2020-12-15style: do not "break" in switch() after "return"Libravatar Ævar Arnfjörð Bjarmason2-3/+0
2020-12-15compat-util: pretend that stub setitimer() always succeedsLibravatar Junio C Hamano1-1/+1
2020-12-15strmap: make callers of strmap_remove() to call it in void contextLibravatar Junio C Hamano1-2/+2
2020-12-14doc: mention Python 3.x supportsLibravatar Đoàn Trần Công Danh2-3/+2
2020-12-14Git 2.30-rc0Libravatar Junio C Hamano2-1/+29
2020-12-14Merge branch 'js/t5526-with-no-particular-primary-branch-name'Libravatar Junio C Hamano1-40/+43
2020-12-14Merge branch 'js/cmake-extra-built-ins-fix'Libravatar Junio C Hamano1-4/+11
2020-12-14Merge branch 'da/vs-build-iconv-fix'Libravatar Junio C Hamano3-3/+2
2020-12-14Merge branch 'jk/multi-line-indent-style-fix'Libravatar Junio C Hamano2-2/+2
2020-12-14Merge branch 'jk/check-config-parsing-error-in-upload-pack'Libravatar Junio C Hamano2-1/+10
2020-12-14Merge branch 'ae/doc-reproducible-html'Libravatar Junio C Hamano1-1/+4
2020-12-14Merge branch 'so/glossary-branch-is-not-necessarily-active'Libravatar Junio C Hamano1-1/+1
2020-12-14Merge branch 'fc/atmark-in-refspec'Libravatar Junio C Hamano3-51/+62
2020-12-14Merge branch 'dd/help-autocorrect-never'Libravatar Junio C Hamano3-18/+52
2020-12-14index-format.txt: document v2 format of file system monitor extensionLibravatar Jeff Hostetler1-2/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 01:25:37 +0000