Commit Graph

61424 Commits (de8dafbada811bc1bc8e1288541931f3c5406231)
 

Author SHA1 Message Date
Seth House de8dafbada mergetool: break setup_tool out into separate initialization function 2 years ago
Seth House 98ea309b3f mergetool: add hideResolved configuration 2 years ago
Junio C Hamano 6d3ef5b467 Git 2.30-rc1 2 years ago
Junio C Hamano 59fcf746f5 Merge branch 'jc/diff-I-status-fix' 2 years ago
Junio C Hamano d4187bd4d5 Merge branch 'es/perf-export-fix' 2 years ago
Junio C Hamano 21fa5bb972 Merge branch 'rb/nonstop-config-mak-uname-update' 2 years ago
Junio C Hamano 3517022568 Merge branch 'ab/unreachable-break' 2 years ago
Junio C Hamano e0f58c9b3e Merge branch 'jc/strmap-remove-typefix' 2 years ago
Junio C Hamano ecfc02df85 Merge branch 'jc/compat-util-setitimer-fix' 2 years ago
Junio C Hamano 263dc03b82 Merge branch 'dd/doc-p4-requirements-update' 2 years ago
Junio C Hamano 772bdcd429 Merge branch 'js/init-defaultbranch-advice' 2 years ago
Junio C Hamano f4d8e19123 Merge https://github.com/prati0100/git-gui 2 years ago
Pratyush Yadav 7b0cfe156e Merge branch 'sh/inactive-background' 2 years ago
Stefan Haller da4d86da97 git-gui: use gray background for inactive text widgets 2 years ago
Junio C Hamano ba2aa15129 Another batch before 2.30-rc1 2 years ago
Junio C Hamano 7bceb83bfe Merge branch 'jh/index-v2-doc-on-fsmn' 2 years ago
Junio C Hamano 94dc98d1d2 Merge branch 'jb/midx-doc-update' 2 years ago
Junio C Hamano f0c592dcfd Merge branch 'rj/make-clean' 2 years ago
Junio C Hamano 689010ca3c Merge branch 'js/t7064-master-to-initial' 2 years ago
Junio C Hamano f4fb219a97 Merge branch 'js/t6300-hardcode-main' 2 years ago
Junio C Hamano e5ace7167a Merge branch 'jk/oid-array-cleanup' 2 years ago
Junio C Hamano 21127fa982 Merge branch 'tb/partial-clone-filters-fix' 2 years ago
Junio C Hamano 9feed4e2a6 Merge branch 'js/t7900-protect-pwd-in-config-get' 2 years ago
Pratyush Yadav 62aed982fd Merge branch 'st/selected-text-colors' 2 years ago
Serg Tereshchenko 4d22c0505f git-gui: Fix selected text colors 2 years ago
Pratyush Yadav 796f6525b1 Merge branch 'rj/clean-speedup' 2 years ago
Ramsay Jones 5bc8b5d5c1 Makefile: conditionally include GIT-VERSION-FILE 2 years ago
Pratyush Yadav 7d6d21f5b9 Merge branch 'sh/macos-labels' 2 years ago
Stefan Haller f9481b195b git-gui: fix colored label backgrounds when using themed widgets 2 years ago
Randall S. Becker 731d578b4f config.mak.uname: remove old NonStop compatibility settings 2 years ago
Junio C Hamano 50f0439490 diff: correct interaction between --exit-code and -I<pattern> 2 years ago
Eric Sunshine f4698738f9 t/perf: fix test_export() failure with BSD `sed` 2 years ago
Ævar Arnfjörð Bjarmason 56f56ac50b style: do not "break" in switch() after "return" 2 years ago
Junio C Hamano 14639a4779 compat-util: pretend that stub setitimer() always succeeds 2 years ago
Junio C Hamano 37e73233c3 strmap: make callers of strmap_remove() to call it in void context 2 years ago
Đoàn Trần Công Danh fcedbc1cf6 doc: mention Python 3.x supports 2 years ago
Junio C Hamano 1c52ecf4ba Git 2.30-rc0 2 years ago
Junio C Hamano 3fc7fc1c5f Merge branch 'js/t5526-with-no-particular-primary-branch-name' 2 years ago
Junio C Hamano 043bfc62e3 Merge branch 'js/cmake-extra-built-ins-fix' 2 years ago
Junio C Hamano ccbde2c4f4 Merge branch 'da/vs-build-iconv-fix' 2 years ago
Junio C Hamano 3c9f0df16a Merge branch 'jk/multi-line-indent-style-fix' 2 years ago
Junio C Hamano a5e74b4baa Merge branch 'jk/check-config-parsing-error-in-upload-pack' 2 years ago
Junio C Hamano aa35dadb26 Merge branch 'ae/doc-reproducible-html' 2 years ago
Junio C Hamano c9f1f4412c Merge branch 'so/glossary-branch-is-not-necessarily-active' 2 years ago
Junio C Hamano c59b73bef3 Merge branch 'fc/atmark-in-refspec' 2 years ago
Junio C Hamano 78abcff222 Merge branch 'dd/help-autocorrect-never' 2 years ago
Jeff Hostetler 5885367e8f index-format.txt: document v2 format of file system monitor extension 2 years ago
Johannes Berg 633eebe142 docs: multi-pack-index: remove note about future 'verify' work 2 years ago
Johannes Schindelin 675704c74d init: provide useful advice about init.defaultBranch 2 years ago
Johannes Schindelin cc0f13c57d get_default_branch_name(): prepare for showing some advice 2 years ago