summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2020-12-27Git 2.30v2.30.0Junio C Hamano2-12/+9
2020-12-27Merge branch 'pb/doc-git-linkit-fix'Junio C Hamano1-2/+2
2020-12-27Merge tag 'l10n-2.30.0-rnd2' of https://github.com/git-l10n/git-poJunio C Hamano12-26547/+53354
2020-12-27l10n: zh_CN: for git v2.30.0 l10n round 1 and 2Jiang Xin1-2475/+2588
2020-12-25Merge branch 'l10n/zh_TW/201223' of github.com:l10n-tw/git-poJiang Xin1-2744/+2602
2020-12-25l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated)pan934121-2744/+2602
2020-12-23l10n: pl.po: add translation and set team leaderArusekk2-8992/+22386
2020-12-23Git 2.30-rc2v2.30.0-rc2Junio C Hamano2-1/+6
2020-12-23Merge branch 'nk/refspecs-negative-fix'Junio C Hamano2-3/+64
2020-12-23Merge branch 'ma/maintenance-crontab-fix'Junio C Hamano3-5/+20
2020-12-23Merge branch 'dl/checkout-p-merge-base'Junio C Hamano2-2/+9
2020-12-23Merge branch 'js/no-more-prepare-for-main-in-test'Junio C Hamano11-619/+621
2020-12-23Merge branch 'jx/pack-redundant-on-single-pack'Junio C Hamano2-4/+39
2020-12-23l10n: pl.po: started Polish translationm4sk1n1-0/+12579
2020-12-23l10n: de.po: Update German translation for Git 2.30.0Matthias Rüster1-2600/+2729
2020-12-23Merge branch 'master' of github.com:Softcatala/git-poJiang Xin1-1082/+755
2020-12-22git.txt: fix typos in 'linkgit' macro invocationPhilippe Blain1-2/+2
2020-12-22l10n: Update Catalan translationJordi Mas1-1082/+755
2020-12-22l10n: bg.po: Updated Bulgarian translation (5037t)Alexander Shopov1-2480/+2600
2020-12-21negative-refspec: improve comment on query_matches_negative_refspecNipunn Koorapati1-0/+6
2020-12-21negative-refspec: fix segfault on : refspecNipunn Koorapati2-3/+58
2020-12-22Merge branch 'fr_2.30_rnd2' of github.com:jnavila/gitJiang Xin1-382/+419
2020-12-21t7900-maintenance: test for magic markersMartin Ågren1-0/+9
2020-12-21gc: fix handling of crontab magic markersMartin Ågren2-4/+10
2020-12-21git-maintenance.txt: add missing wordMartin Ågren1-1/+1
2020-12-21checkout -p: handle tree arguments correctly againJohannes Schindelin2-2/+9
2020-12-21l10n: fr.po v2.30.0 rnd 2Jean-Noël Avila1-382/+419
2020-12-21l10n: tr: v2.30.0-r2Emir Sarı1-374/+392
2020-12-21l10n: sv.po: Update Swedish translation (5037t0f0u)Peter Krefting1-371/+393
2020-12-21l10n: vi.po(5037t): v2.30.0 rnd 2Tran Ngoc Quan1-2621/+2783
2020-12-21l10n: git.pot: v2.30.0 round 2 (1 new, 2 removed)Jiang Xin1-370/+376
2020-12-21Merge remote-tracking branch 'github/master' into git-po-masterJiang Xin43-1794/+2162
2020-12-19l10n: Update Catalan translationJordi Mas1-2704/+2992
2020-12-18Git 2.30-rc1v2.30.0-rc1Junio C Hamano2-1/+5
2020-12-18Merge branch 'jc/diff-I-status-fix'Junio C Hamano2-1/+26
2020-12-18Merge branch 'es/perf-export-fix'Junio C Hamano1-2/+7
2020-12-18Merge branch 'rb/nonstop-config-mak-uname-update'Junio C Hamano1-4/+0
2020-12-18Merge branch 'ab/unreachable-break'Junio C Hamano2-3/+0
2020-12-18Merge branch 'jc/strmap-remove-typefix'Junio C Hamano1-2/+2
2020-12-18Merge branch 'jc/compat-util-setitimer-fix'Junio C Hamano1-1/+1
2020-12-18Merge branch 'dd/doc-p4-requirements-update'Junio C Hamano2-3/+2
2020-12-18Merge branch 'js/init-defaultbranch-advice'Junio C Hamano10-20/+61
2020-12-18Merge https://github.com/prati0100/git-guiJunio C Hamano6-1397/+1711
2020-12-19Merge branch 'sh/inactive-background'Pratyush Yadav2-16/+37
2020-12-19git-gui: use gray background for inactive text widgetsStefan Haller2-16/+37
2020-12-17Another batch before 2.30-rc1Junio C Hamano1-0/+2
2020-12-17Merge branch 'jh/index-v2-doc-on-fsmn'Junio C Hamano1-2/+8
2020-12-17Merge branch 'jb/midx-doc-update'Junio C Hamano1-4/+0
2020-12-17Merge branch 'rj/make-clean'Junio C Hamano3-8/+15
2020-12-17Merge branch 'js/t7064-master-to-initial'Junio C Hamano1-51/+52
2020-12-17Merge branch 'js/t6300-hardcode-main'Junio C Hamano1-88/+90
2020-12-17Merge branch 'jk/oid-array-cleanup'Junio C Hamano6-199/+157
2020-12-17Merge branch 'tb/partial-clone-filters-fix'Junio C Hamano3-6/+21
2020-12-17Merge branch 'js/t7900-protect-pwd-in-config-get'Junio C Hamano1-2/+2
2020-12-18Merge branch 'st/selected-text-colors'Pratyush Yadav1-2/+4
2020-12-18git-gui: Fix selected text colorsSerg Tereshchenko1-2/+4
2020-12-18Merge branch 'rj/clean-speedup'Pratyush Yadav1-0/+2
2020-12-18Makefile: conditionally include GIT-VERSION-FILERamsay Jones1-0/+2
2020-12-18Merge branch 'sh/macos-labels'Pratyush Yadav1-2/+2
2020-12-18git-gui: fix colored label backgrounds when using themed widgetsStefan Haller1-2/+2
2020-12-16config.mak.uname: remove old NonStop compatibility settingsRandall S. Becker1-4/+0
2020-12-16pack-redundant: fix crash when one packfile in repoJiang Xin2-4/+39
2020-12-16tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereqJohannes Schindelin1-8/+0
2020-12-16t9902: use `main` as initial branch nameJohannes Schindelin1-154/+155
2020-12-16t6302: use `main` as initial branch nameJohannes Schindelin1-29/+30
2020-12-16t5703: use `main` as initial branch nameJohannes Schindelin1-32/+33
2020-12-16t5510: use `main` as initial branch nameJohannes Schindelin1-83/+85
2020-12-16t5505: finalize transitioning to using the branch name `main`Johannes Schindelin1-78/+78
2020-12-16t3205: finalize transitioning to using the branch name `main`Johannes Schindelin1-4/+5
2020-12-16t3203: complete the transition to using the branch name `main`Johannes Schindelin1-21/+22
2020-12-16t3201: finalize transitioning to using the branch name `main`Johannes Schindelin1-41/+42
2020-12-16t3200: finish transitioning to the initial branch name `main`Johannes Schindelin1-132/+133
2020-12-16t1400: use `main` as initial branch nameJohannes Schindelin1-37/+38
2020-12-16diff: correct interaction between --exit-code and -I<pattern>Junio C Hamano2-1/+26
2020-12-17Merge branch 'fr_next' of github.com:jnavila/git into git-po-masterJiang Xin1-2400/+2413
2020-12-17Merge branch '2.30-rc1' of github.com:bitigchi/git-poJiang Xin1-2410/+2506
2020-12-16l10n: fr.po: v2.30.0 rnd 1Jean-Noël Avila1-2396/+2409
2020-12-16l10n: fr.po Fix a typoBaptiste Fontaine1-1/+1
2020-12-16l10n: fr fix misleading messageJean-Noël Avila1-4/+4
2020-12-16t/perf: fix test_export() failure with BSD `sed`Eric Sunshine1-2/+7
2020-12-16l10n: tr: v2.30.0-r1Emir Sarı1-2410/+2506
2020-12-15style: do not "break" in switch() after "return"Ævar Arnfjörð Bjarmason2-3/+0
2020-12-15compat-util: pretend that stub setitimer() always succeedsJunio C Hamano1-1/+1
2020-12-15strmap: make callers of strmap_remove() to call it in void contextJunio C Hamano1-2/+2
2020-12-15l10n: sv.po: Update Swedish translation (5038t0f0u)Peter Krefting1-2332/+2532
2020-12-15l10n: git.pot: v2.30.0 round 1 (70 new, 45 removed)Jiang Xin1-2276/+2375
2020-12-14doc: mention Python 3.x supportsĐoàn Trần Công Danh2-3/+2
2020-12-14Git 2.30-rc0v2.30.0-rc0Junio C Hamano2-1/+29
2020-12-14Merge branch 'js/t5526-with-no-particular-primary-branch-name'Junio C Hamano1-40/+43
2020-12-14Merge branch 'js/cmake-extra-built-ins-fix'Junio C Hamano1-4/+11
2020-12-14Merge branch 'da/vs-build-iconv-fix'Junio C Hamano3-3/+2
2020-12-14Merge branch 'jk/multi-line-indent-style-fix'Junio C Hamano2-2/+2
2020-12-14Merge branch 'jk/check-config-parsing-error-in-upload-pack'Junio C Hamano2-1/+10
2020-12-14Merge branch 'ae/doc-reproducible-html'Junio C Hamano1-1/+4
2020-12-14Merge branch 'so/glossary-branch-is-not-necessarily-active'Junio C Hamano1-1/+1
2020-12-14Merge branch 'fc/atmark-in-refspec'Junio C Hamano3-51/+62
2020-12-14Merge branch 'dd/help-autocorrect-never'Junio C Hamano3-18/+52
2020-12-14index-format.txt: document v2 format of file system monitor extensionJeff Hostetler1-2/+8
2020-12-14docs: multi-pack-index: remove note about future 'verify' workJohannes Berg1-4/+0
2020-12-13init: provide useful advice about init.defaultBranchJohannes Schindelin4-4/+29
2020-12-13get_default_branch_name(): prepare for showing some adviceJohannes Schindelin5-11/+14
2020-12-13branch -m: allow renaming a yet-unborn branchJohannes Schindelin2-1/+11
2020-12-13init: document `init.defaultBranch` betterJohannes Schindelin1-4/+7
2020-12-09t7900: use --fixed-value in git-maintenance testsJosh Steadmon1-2/+2
2020-12-08Makefile: don't use a versioned temp distribution directoryRamsay Jones1-7/+8
2020-12-08Makefile: don't try to clean old debian build productRamsay Jones1-1/+1
2020-12-08gitweb/Makefile: conditionally include ../GIT-VERSION-FILERamsay Jones1-0/+2
2020-12-08Documentation/Makefile: conditionally include ../GIT-VERSION-FILERamsay Jones1-0/+2
2020-12-08Documentation/Makefile: conditionally include doc.depRamsay Jones1-0/+2
2020-12-08Eleventh batchJunio C Hamano1-0/+45
2020-12-08Merge branch 'fc/zsh-completion'Junio C Hamano2-1/+2
2020-12-08Merge branch 'sn/config-doc-typofix'Junio C Hamano1-1/+1
2020-12-08Merge branch 'fc/random-cleanup'Junio C Hamano4-18/+16
2020-12-08Merge branch 'nm/imap-send-use-default-config'Junio C Hamano1-22/+30
2020-12-08Merge branch 'jk/banned'Junio C Hamano1-0/+13
2020-12-08Merge branch 'tb/bugreport-no-localtime'Junio C Hamano1-1/+2
2020-12-08Merge branch 'rs/maintenance-run-outside-repo'Junio C Hamano3-8/+9
2020-12-08Merge branch 'rs/fetch-pack-invalid-lockfile'Junio C Hamano1-2/+3
2020-12-08Merge branch 'nk/perf-fsmonitor-cleanup'Junio C Hamano1-2/+1
2020-12-08Merge branch 'ma/grep-init-default'Junio C Hamano6-100/+36
2020-12-08Merge branch 'js/trace2-session-id'Junio C Hamano12-3/+198
2020-12-08Merge branch 'mt/do-not-use-scld-in-working-tree'Junio C Hamano5-6/+47
2020-12-08Merge branch 'ds/maintenance-part-3'Junio C Hamano2-2/+15
2020-12-08Merge branch 'ds/maintenance-part-2'Junio C Hamano1-2/+4
2020-12-08Merge branch 'ds/config-literal-value'Junio C Hamano7-76/+312
2020-12-08Merge branch 'ds/maintenance-part-1'Junio C Hamano1-0/+1
2020-12-08Merge branch 'tb/idx-midx-race-fix'Junio C Hamano3-20/+31
2020-12-08Merge branch 'ps/update-ref-multi-transaction'Junio C Hamano4-50/+126
2020-12-08Merge branch 'js/add-i-color-fix'Junio C Hamano4-32/+127
2020-12-08Merge branch 'jt/trace-error-on-warning'Junio C Hamano2-1/+7
2020-12-08t7064: avoid relying on a specific default branch nameJohannes Schindelin1-51/+52
2020-12-08t7900: fix typo: "test_execpt_success"Josh Steadmon1-1/+1
2020-12-07completion: bash: fix gitk alias regressionFelipe Contreras1-1/+1
2020-12-07commit-graph: use size_t for array allocation and indexingJeff King1-2/+2
2020-12-07commit-graph: replace packed_oid_list with oid_arrayJeff King1-47/+15
2020-12-07commit-graph: drop count_distinct_commits() functionJeff King1-41/+2
2020-12-07oid-array: provide a for-loop iteratorJeff King2-5/+25
2020-12-07t6300: avoid using the default name of the initial branchJohannes Schindelin1-88/+90
2020-12-04oid-array: make sort function publicJeff King2-5/+10
2020-12-04cache.h: move hash/oid functions to hash.hJeff King2-94/+95
2020-12-04t0064: make duplicate tests more robustJeff King1-2/+5
2020-12-04t0064: drop sha1 mention from filenameJeff King1-1/+1
2020-12-04oid-array.h: drop sha1 mention from header guardJeff King1-3/+3
2020-12-04cmake: determine list of extra built-ins dynamicallyJohannes Schindelin1-4/+11
2020-12-04t5526: drop the prereq expecting the default branch name `main`Johannes Schindelin1-21/+21
2020-12-04t5526: avoid depending on a specific default branch nameJohannes Schindelin1-19/+22
2020-12-04ci(vs-build): stop passing the iconv library location explicitlyDennis Ameling3-3/+2
2020-12-03upload-pack.c: don't free allowed_filters util pointersTaylor Blau2-2/+10
2020-12-03builtin/clone.c: don't ignore transport_fetch_refs() errorsTaylor Blau1-4/+11
2020-12-03style: indent multiline "if" conditions to alignJeff King2-2/+2
2020-12-03upload-pack: propagate return value from object filter config callbackJeff King2-1/+10
2020-12-03Tenth batchJunio C Hamano1-5/+16
2020-12-03Merge branch 'pk/subsub-fetch-fix'Junio C Hamano2-67/+10
2020-12-03Merge branch 'jk/stop-pack-objects-when-fetch-is-killed'Junio C Hamano1-0/+1
2020-12-03Merge branch 'jk/stop-pack-objects-when-push-is-killed'Junio C Hamano1-0/+1
2020-12-03Merge branch 'tb/repack-simplify'Junio C Hamano1-99/+54
2020-12-03Merge branch 'pb/pull-rebase-recurse-submodules'Junio C Hamano2-14/+90
2020-12-03Merge branch 'ab/retire-parse-remote'Junio C Hamano6-138/+11
2020-12-02doc: make HTML manual reproducibleArnout Engelen1-1/+4
2020-12-02Revert "submodules: fix of regression on fetching of non-init subsub-repo"Junio C Hamano2-67/+10
2020-12-02glossary: improve "branch" definitionSergey Organov1-1/+1
2020-12-02Makefile: mark git-maintenance as a builtinJeff King1-0/+1
2020-12-02apply: don't use core.sharedRepository to create working tree filesMatheus Tavares5-6/+47
2020-12-02banned.h: mark ctime_r() and asctime_r() as bannedJeff King1-0/+4
2020-12-02gitignore: remove entry for git serveRené Scharfe1-1/+0
2020-12-02gitignore: drop duplicate entry for git-sh-i18nJeff King1-1/+0
2020-12-02t7900: speed up expensive testJeff King1-2/+4
2020-12-01banned.h: mark non-reentrant gmtime, etc as bannedJeff King1-0/+9
2020-12-01config.txt: fix a typo (backslash != backquote)Štěpán Němec1-1/+1
2020-12-01builtin/bugreport.c: use thread-safe localtime_r()Taylor Blau1-1/+2
2020-12-01upload-pack: kill pack-objects helper on signal or exitJeff King1-0/+1
2020-12-02Merge branch 'da/askpass-mask-checkbox'Pratyush Yadav1-1/+14
2020-12-02git-gui: ssh-askpass: add a checkbox to show the input textDavid Aguilar1-1/+14
2020-12-02Merge branch 'dr/russian-translation'Pratyush Yadav1-1375/+1644
2020-12-02git-gui: update Russian translationDimitriy Ryazantcev1-1375/+1644
2020-12-01imap-send: parse default git configNicolas Morey-Chaisemartin1-22/+30
2020-12-02Merge branch 'ms/commit-template'Pratyush Yadav2-3/+10
2020-12-01completion: zsh: fix file completion regressionFelipe Contreras1-0/+1
2020-12-01tests: lib-functions: trivial style cleanupsFelipe Contreras1-4/+4
2020-12-01test: completion: fix typosFelipe Contreras1-2/+2
2020-12-01.gitignore: remove dangling fileFelipe Contreras1-1/+0
2020-12-01refspec: trivial cleanupFelipe Contreras1-9/+10
2020-11-30Ninth batchJunio C Hamano1-0/+21
2020-11-30Merge branch 'sa/credential-store-timeout'Junio C Hamano2-2/+12
2020-11-30Merge branch 'km/stash-error-message-fix'Junio C Hamano1-1/+1
2020-11-30Merge branch 'hn/sleep-millisec-decl'Junio C Hamano2-1/+2
2020-11-30Merge branch 'js/t3404-master-to-primary'Junio C Hamano1-44/+45
2020-11-30Merge branch 'na/notes-displayref-is-not-boolean'Junio C Hamano2-1/+6
2020-11-30Merge branch 'jc/do-not-just-explain-but-update-your-patch'Junio C Hamano1-1/+15
2020-11-30Merge branch 'mt/worktree-error-message-fix'Junio C Hamano1-2/+2
2020-11-30Merge branch 'ab/gc-keep-base-option'Junio C Hamano2-7/+7
2020-11-30Merge branch 'js/t1309-master-to-topic'Junio C Hamano1-2/+2
2020-11-30Merge branch 'js/pull-rebase-use-advise'Junio C Hamano2-14/+17
2020-11-30Merge branch 'js/t4015-wo-master'Junio C Hamano1-3/+3
2020-11-30Merge branch 'js/t3040-cleanup'Junio C Hamano1-3/+0
2020-11-30Merge branch 'js/t2106-cleanup'Junio C Hamano1-14/+17
2020-11-30fetch-pack: disregard invalid pack lockfilesRené Scharfe1-2/+3
2020-11-30refspec: make @ a synonym of HEADFelipe Contreras3-52/+62
2020-11-30tests: push: trivial cleanupFelipe Contreras1-2/+1
2020-11-30tests: push: improve cleanup of HEAD testsFelipe Contreras1-1/+3