summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2020-10-19Git 2.29v2.29.0Junio C Hamano1-1/+1
2020-10-18Merge tag 'l10n-2.29.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano13-43679/+58411
2020-10-18Merge branch 'master' of github.com:Softcatala/git-poJiang Xin1-3572/+4352
2020-10-18l10n: zh_CN: for git v2.29.0 l10n round 1 and 2Jiang Xin1-3432/+3788
2020-10-17Merge https://github.com/prati0100/git-guiJunio C Hamano3-49/+93
2020-10-17Merge branch 'sh/blame-tooltip'Pratyush Yadav1-0/+1
2020-10-17git-gui: blame: prevent tool tips from sticking around after Command-TabStefan Haller1-0/+1
2020-10-15Git 2.29-rc2v2.29.0-rc2Junio C Hamano1-1/+1
2020-10-15l10n: de.po: Update German translation for Git 2.29.0Matthias Rüster1-3452/+3817
2020-10-14Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-poJiang Xin2-5139/+14813
2020-10-13l10n: vi(5013t): Updated translation for v2.29.0 rd2Tran Ngoc Quan1-3432/+3869
2020-10-12l10n: pt_PT: make on po/pt_PT.poDaniel Santos1-5136/+14811
2020-10-12l10n: Portuguese translation team has changed. Wohoo!Daniel Santos1-3/+2
2020-10-12Merge branch 'master' of github.com:alshopov/git-poJiang Xin1-3579/+4205
2020-10-12Merge branch 'master' of github.com:nafmo/git-l10n-svJiang Xin1-3429/+3843
2020-10-12Merge branch 'update-italian-translation' of github.com:AlessandroMenti/git-poJiang Xin1-141/+141
2020-10-11l10n: bg.po: Updated Bulgarian translation (5013t)Alexander Shopov1-3579/+4205
2020-10-11l10n: sv.po: Update Swedish translation (5013t0f0u)Peter Krefting1-3429/+3843
2020-10-11Merge branch 'l10n/zh_TW/201010' of github.com:l10n-tw/git-poJiang Xin1-3425/+3892
2020-10-11l10n: it.po: update the Italian translationAlessandro Menti1-141/+141
2020-10-11Merge branch '2.29-r2' of github.com:bitigchi/git-poJiang Xin1-129/+131
2020-10-10l10n: tr: v2.29.0 round 2Emir Sarı1-129/+131
2020-10-10l10n: zh_TW.po: v2.29.0 round 2 (2 untranslated)pan934121-3425/+3892
2020-10-10l10n: fr: v2.29.0 rnd 2Jean-Noël Avila1-142/+174
2020-10-10l10n: git.pot: v2.29.0 round 2 (1 new, 1 removed)Jiang Xin1-116/+116
2020-10-10Merge tag 'v2.29.0-rc1' of github.com:git/gitJiang Xin22-89/+159
2020-10-08Git 2.29-rc1v2.29.0-rc1Junio C Hamano2-14/+22
2020-10-08Merge branch 'js/default-branch-name-part-3'Junio C Hamano5-25/+25
2020-10-08Merge branch 'js/ci-ghwf-dedup-tests'Junio C Hamano2-1/+40
2020-10-08Merge branch 'ja/misc-doc-fixes'Junio C Hamano5-21/+21
2020-10-08Merge branch 'dl/makefile-sort'Junio C Hamano1-5/+5
2020-10-08Merge branch 'js/no-builtins-on-disk-option'Junio C Hamano3-0/+22
2020-10-08Merge branch 'js/ghwf-setup-msbuild-update'Junio C Hamano1-1/+1
2020-10-08Merge branch 'jk/index-pack-hotfixes'Junio C Hamano2-17/+19
2020-10-08Merge branch 'dl/mingw-header-cleanup'Junio C Hamano1-1/+1
2020-10-08Merge branch 'hx/push-atomic-with-cert'Junio C Hamano1-4/+3
2020-10-08doc: fix the bnf like style of some commandsJean-Noël Avila2-2/+2
2020-10-08doc: git-remote fix upsJean-Noël Avila1-10/+10
2020-10-08doc: use linkgit macro where needed.Jean-Noël Avila1-1/+1
2020-10-08git-bisect-lk2009: make continuation of list indentedJean-Noël Avila1-8/+8
2020-10-08ci: do not skip tagged revisions in GitHub workflowsJohannes Schindelin1-0/+2
2020-10-08ci: skip GitHub workflow runs for already-tested commits/treesJohannes Schindelin1-1/+38
2020-10-08tests: avoid using the branch name `main`Johannes Schindelin4-16/+16
2020-10-08t1415: avoid using `main` as ref nameJohannes Schindelin1-9/+9
2020-10-08Makefile: ASCII-sort += listsDenton Liu1-5/+5
2020-10-08Merge branch 'st/dark-mode' into masterPratyush Yadav2-6/+49
2020-10-08Merge branch 'fr_2.29.0_rnd_1' of github.com:jnavila/gitJiang Xin1-3406/+3842
2020-10-07help: do not expect built-in commands to be hardlinkedJohannes Schindelin3-0/+22
2020-10-07index-pack: make get_base_data() comment clearerJonathan Tan1-11/+8
2020-10-07l10n: fr: v2.29.0 rnd 1Jean-Noël Avila1-3406/+3842
2020-10-07l10n: it.po: update the Italian translation for Git 2.29.0 round 1Alessandro Menti1-3425/+3873
2020-10-07index-pack: drop type_cas mutexJeff King1-6/+0
2020-10-07index-pack: restore "resolving deltas" progress meterJeff King2-0/+11
2020-10-07compat/mingw.h: drop extern from function declarationDenton Liu1-1/+1
2020-10-07GitHub workflow: automatically follow minor updates of setup-msbuildJohannes Schindelin1-1/+1
2020-10-07git-gui: improve dark mode supportSerg Tereshchenko2-6/+49
2020-10-06t5534: split stdout and stderr redirectionĐoàn Trần Công Danh1-4/+3
2020-10-06l10n: tr: v2.29.0 round 1Emir Sarı1-3997/+4342
2020-10-06l10n: Update Catalan translationJordi Mas1-3572/+4352
2020-10-06l10n: git.pot: v2.29.0 round 1 (124 new, 42 removed)Jiang Xin1-3326/+3676
2020-10-05Git 2.29-rc0v2.29.0-rc0Junio C Hamano2-1/+32
2020-10-05Merge branch 'nl/credential-crlf'Junio C Hamano1-1/+1
2020-10-05Merge branch 'sn/fast-import-doc'Junio C Hamano1-1/+1
2020-10-05Merge branch 'pb/submodule-doc-fix'Junio C Hamano1-10/+13
2020-10-05Merge branch 'jk/format-auto-base-when-able'Junio C Hamano3-26/+130
2020-10-05Merge branch 'jk/diff-cc-oidfind-fix'Junio C Hamano2-2/+96
2020-10-05Merge branch 'jk/refspecs-negative'Junio C Hamano7-13/+367
2020-10-05Merge branch 'rs/archive-add-file'Junio C Hamano8-71/+203
2020-10-05Merge branch 'jt/keep-partial-clone-filter-upon-lazy-fetch'Junio C Hamano5-9/+13
2020-10-05Merge branch 'td/submodule-update-quiet'Junio C Hamano2-3/+15
2020-10-05Merge branch 'jk/unused'Junio C Hamano15-33/+88
2020-10-05Merge branch 'js/cmake-vs'Junio C Hamano3-13/+43
2020-10-05Merge branch 'ma/worktree-cleanups'Junio C Hamano5-66/+70
2020-10-05Merge branch 'so/combine-diff-simplify'Junio C Hamano6-23/+18
2020-10-05Merge branch 'js/default-branch-name-part-2'Junio C Hamano11-97/+97
2020-10-05Merge branch 'pm/gitk-update'Junio C Hamano1-5311/+5343
2020-10-05Merge branch 'ds/in-merge-bases-many-optim-bug'Junio C Hamano3-4/+36
2020-10-04fast-import: fix typo in documentationSamanta Navarro1-1/+1
2020-10-04gitsubmodules doc: invoke 'ls-files' with '--recurse-submodules'Philippe Blain1-10/+13
2020-10-04Nineteenth batchJunio C Hamano1-0/+33
2020-10-04Merge branch 'mt/delta-base-cache-races'Junio C Hamano1-19/+29
2020-10-04Merge branch 'jk/shortlog-group-by-trailer'Junio C Hamano7-31/+444
2020-10-04Merge branch 'jc/fmt-merge-msg-suppress-destination'Junio C Hamano1-1/+1
2020-10-04Merge branch 'tb/upload-pack-filters'Junio C Hamano1-1/+1
2020-10-04Merge branch 'jc/sequencer-stopped-sha-simplify'Junio C Hamano1-5/+6
2020-10-04Merge branch 'au/complete-restore-s'Junio C Hamano1-34/+39
2020-10-04Merge branch 'al/ref-filter-merged-and-no-merged'Junio C Hamano1-1/+3
2020-10-04Merge branch 'eg/mailinfo-doc-scissors'Junio C Hamano1-4/+3
2020-10-04Merge branch 'mr/bisect-in-c-2'Junio C Hamano3-78/+274
2020-10-04Merge branch 'cc/bisect-start-fix'Junio C Hamano2-7/+13
2020-10-04Merge branch 'jc/blame-ignore-fix'Junio C Hamano4-25/+81
2020-10-04Merge branch 'jk/drop-unaligned-loads'Junio C Hamano3-29/+4
2020-10-04Merge branch 'js/no-builtins-on-disk-option'Junio C Hamano2-27/+40
2020-10-04Merge branch 'ab/mediawiki-fixes'Junio C Hamano13-401/+169
2020-10-03credential: treat CR/LF as line endings in the credential protocolNikita Leonov1-1/+1
2020-10-03Merge remote-tracking branch 'paulus/master' into pm/gitk-updateJunio C Hamano1-5311/+5343
2020-10-03gitk: Resize panes correctly when reducing window sizePaul Mackerras1-4/+11
2020-10-03gitk: replace tabs with spacesDenton Liu1-5308/+5308
2020-10-02commit-reach: fix in_merge_bases_many bugDerrick Stolee3-4/+36
2020-10-01format-patch: teach format.useAutoBase "whenAble" optionJacob Keller3-26/+130
2020-10-01submodule update: silence underlying merge/rebase with "--quiet"Theodore Dubois2-3/+15
2020-09-30refspec: add support for negative refspecsJacob Keller7-13/+367
2020-09-30combine-diff: handle --find-object in multitree code pathJeff King2-2/+96
2020-09-30hashmap_for_each_entry(): workaround MSVC's runtime check failure #3Junio C Hamano1-1/+2
2020-09-30cmake (Windows): recommend using Visual Studio's built-in CMake supportJohannes Schindelin1-9/+17
2020-09-30cmake (Windows): initialize vcpkg/build dependencies automaticallyJohannes Schindelin1-0/+4
2020-09-30cmake (Windows): complain when encountering an unknown compilerJohannes Schindelin1-0/+2
2020-09-30cmake (Windows): let the `.dll` files be found when running the testsJohannes Schindelin1-0/+3
2020-09-30cmake: quote the path accurately when editing `test-lib.sh`Johannes Schindelin1-1/+1
2020-09-30cmake: fall back to using `vcpkg`'s `msgfmt.exe` on WindowsJohannes Schindelin1-1/+5
2020-09-30dir.c: drop unused "untracked" from treat_path_fast()Jeff King1-2/+1
2020-09-30sequencer: handle ignore_footer when parsing trailersJeff King1-0/+9
2020-09-30test-advise: check argument count with argc instead of argvJeff King1-2/+2
2020-09-30sparse-checkout: fill in some options boilerplateJeff King1-0/+37
2020-09-30sequencer: drop repository argument from run_git_commit()Jeff King1-6/+5
2020-09-30push: drop unused repo argument to do_push()Jeff King1-2/+2
2020-09-30assert PARSE_OPT_NONEG in parse-options callbacksJeff King4-0/+8
2020-09-30env--helper: write to opt->value in parseopt helperJeff King1-4/+7
2020-09-30drop unused argc parametersJeff King5-15/+15
2020-09-30convert: drop unused crlf_action from check_global_conv_flags_eol()Jeff King1-2/+2
2020-09-29Eighteenth batchJunio C Hamano1-0/+24
2020-09-29Merge branch 'ah/pull'Junio C Hamano2-3/+21
2020-09-29Merge branch 'tg/range-diff-same-file-fix'Junio C Hamano2-13/+11
2020-09-29Merge branch 'jc/t1506-rev-parse-leaves-range-endpoint-unpeeled'Junio C Hamano1-0/+18
2020-09-29Merge branch 'dl/zero-oid-in-hooks'Junio C Hamano2-10/+10
2020-09-29Merge branch 'jk/make-protocol-v2-the-default'Junio C Hamano3-11/+2
2020-09-29Merge branch 'bc/clone-with-git-default-hash-fix'Junio C Hamano4-4/+20
2020-09-29Merge branch 'tb/bloom-improvements'Junio C Hamano22-123/+508
2020-09-29Merge branch 'bc/faq-misc'Junio C Hamano1-0/+86
2020-09-29diff: get rid of redundant 'dense' argumentSergey Organov6-23/+18
2020-09-28packfile: fix memory leak in add_delta_base_cache()Matheus Tavares1-2/+5
2020-09-28packfile: fix race condition on unpack_entry()Matheus Tavares1-17/+24
2020-09-28fetch: do not override partial clone filterJonathan Tan3-3/+12
2020-09-28Doc: show example scissors lineEvan Gates1-4/+3
2020-09-28cmake: ensure that the `vcpkg` packages are found on WindowsJohannes Schindelin1-0/+7
2020-09-28cmake: do find Git for Windows' shell interpreterJohannes Schindelin1-1/+1
2020-09-27config/uploadpack.txt: fix typo in `--filter=tree:<n>`Martin Ågren1-1/+1
2020-09-27config/fmt-merge-msg.txt: drop space in quoteMartin Ågren1-1/+1
2020-09-27worktree: use skip_prefix to parse targetMartin Ågren1-7/+7
2020-09-27worktree: rename copy-pasted variableMartin Ågren1-6/+6
2020-09-27worktree: update renamed variable in commentMartin Ågren1-1/+1
2020-09-27worktree: inline `worktree_ref()` into its only callerMartin Ågren2-18/+6
2020-09-27wt-status: introduce wt_status_state_free_buffers()Martin Ågren4-9/+18
2020-09-27wt-status: print to s->fp, not stdoutMartin Ågren1-25/+32
2020-09-27wt-status: replace sha1 mentions with oidMartin Ågren1-4/+4
2020-09-27shortlog: allow multiple groups to be specifiedJeff King5-29/+127
2020-09-27shortlog: parse trailer identsJeff King3-3/+30
2020-09-27shortlog: rename parse_stdin_ident()Jeff King1-3/+3
2020-09-27shortlog: de-duplicate trailer valuesJeff King3-1/+88
2020-09-27shortlog: match commit trailers with --groupJeff King4-1/+72
2020-09-27trailer: add interface for iterating over commit trailersJeff King2-2/+79
2020-09-27shortlog: add grouping optionJeff King4-13/+66
2020-09-26t9902: avoid using the branch name `master`Johannes Schindelin1-5/+5
2020-09-26tests: avoid variations of the `master` branch nameJohannes Schindelin7-58/+58
2020-09-26ref-filter: plug memory leak in reach_filter()René Scharfe1-1/+3
2020-09-26completion: complete refs after 'git restore -s'Ákos Uzonyi1-0/+7
2020-09-26completion: use "prev" variable instead of introducing "prevword"Ákos Uzonyi1-34/+32
2020-09-25Seventeenth batchJunio C Hamano1-0/+19
2020-09-25Merge branch 'jk/diff-highlight-blank-match-fix'Junio C Hamano1-1/+1
2020-09-25Merge branch 'hx/push-atomic-with-cert'Junio C Hamano2-26/+51
2020-09-25Merge branch 'rs/misc-cleanups'Junio C Hamano1-8/+4
2020-09-25Merge branch 'ld/p4-unshelve-fix'Junio C Hamano2-2/+5
2020-09-25Merge branch 'jx/proc-receive-hook'Junio C Hamano48-100/+4325
2020-09-25Merge branch 'ds/maintenance-part-1'Junio C Hamano24-28/+568
2020-09-25sequencer: stop abbreviating stopped-sha fileJunio C Hamano1-5/+6
2020-09-25t1506: rev-parse A..B and A...BJunio C Hamano1-0/+18
2020-09-25protocol: re-enable v2 protocol by defaultJeff King3-11/+2
2020-09-25cmake: ignore files generated by CMake as run in Visual StudioJohannes Schindelin1-0/+1
2020-09-25shortlog: change "author" variables to "ident"Jeff King1-18/+18
2020-09-25bisect: don't use invalid oid as rev when startingChristian Couder2-7/+13
2020-09-24pull: don't warn if pull.ff has been setAlex Henrie2-3/+21
2020-09-24blame: validate and peel the object names on the ignore listJunio C Hamano4-13/+69
2020-09-24t8013: minimum preparatory clean-upJunio C Hamano1-11/+11
2020-09-24diff: fix modified lines stats with --stat and --numstatThomas Guyot-Sionnest2-13/+11
2020-09-24Revert "fast-export: use local array to store anonymized oid"Jeff King1-4/+4
2020-09-24bswap.h: drop unaligned loadsJeff King2-25/+0
2020-09-24bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functi...Pranit Bauva3-47/+191
2020-09-24bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'Miriam Rubio1-0/+2
2020-09-24bisect--helper: reimplement `bisect_autostart` shell function in CPranit Bauva2-24/+45
2020-09-23hooks--update.sample: use hash-agnostic zero OIDDenton Liu1-1/+1
2020-09-23hooks--pre-push.sample: use hash-agnostic zero OIDDenton Liu1-3/+3
2020-09-23hooks--pre-push.sample: modernize scriptDenton Liu1-8/+8
2020-09-22Sixteenth batchJunio C Hamano1-0/+31
2020-09-22Merge branch 'ar/fetch-ipversion-in-all'Junio C Hamano1-1/+4
2020-09-22Merge branch 'dl/complete-format-patch-recent-features'Junio C Hamano1-0/+4
2020-09-22Merge branch 'cs/don-t-pretend-a-failed-remote-set-head-succeeded'Junio C Hamano1-1/+1
2020-09-22Merge branch 'jk/dont-count-existing-objects-twice'Junio C Hamano2-0/+5
2020-09-22Merge branch 'al/ref-filter-merged-and-no-merged'Junio C Hamano13-77/+140
2020-09-22Merge branch 'cd/commit-graph-doc'Junio C Hamano1-1/+1
2020-09-22Merge branch 'kk/build-portability-fix'Junio C Hamano2-34/+34
2020-09-22Merge branch 'ls/mergetool-meld-auto-merge'Junio C Hamano3-16/+96
2020-09-22Merge branch 'pw/add-p-edit-ita-path'Junio C Hamano3-94/+173
2020-09-22Merge branch 'hn/refs-trace-backend'Junio C Hamano5-0/+409
2020-09-22Merge branch 'jt/threaded-index-pack'Junio C Hamano2-207/+251
2020-09-22Merge branch 'es/format-patch-interdiff-cleanup'Junio C Hamano7-48/+47
2020-09-22Merge branch 'os/fetch-submodule-optim'Junio C Hamano1-1/+3
2020-09-22builtin/clone: avoid failure with GIT_DEFAULT_HASHbrian m. carlson4-4/+20
2020-09-22Merge branch 'st/spaces-tabs-cleanup' into masterPratyush Yadav1-43/+43
2020-09-22git-gui: fix mixed tabs and spaces; prefer tabsSerg Tereshchenko1-43/+43
2020-09-21diff-highlight: correctly match blank lines for flushJeff King1-1/+1