summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2022-06-26l10n: ru.po: update Russian translationDimitriy Ryazantcev1-12974/+10330
2022-06-26Merge branch 'l10n/zh_TW/220623' of github.com:l10n-tw/git-poJiang Xin1-13955/+12996
2022-06-25l10n: zh_TW: v2.37.0 round 1Yi-Jyun Pan1-13955/+12996
2022-06-25Merge branch 'master' of github.com:vnwildman/gitJiang Xin1-12953/+7839
2022-06-25l10n: vi(5367t): Updated translationTran Ngoc Quan1-12953/+7839
2022-06-24l10n: fr v2.37 round 1Jean-Noël Avila1-13724/+7931
2022-06-24l10n: Update Catalan translationJordi Mas1-13360/+8338
2022-06-23Merge branch 'ab/credentials-in-url-more'Junio C Hamano1-1/+1
2022-06-23Documentation/config/transfer.txt: fix typoTaylor Blau1-1/+1
2022-06-23rev-parse: documentation adjustment - mention remote tracking with @{u}Tao Klerks1-9/+6
2022-06-23Merge branch 'po-id' of github.com:bagasme/git-poJiang Xin1-12673/+12990
2022-06-23Git 2.36.2v2.36.2Johannes Schindelin2-5/+11
2022-06-23Sync with 2.35.4Johannes Schindelin11-12/+282
2022-06-23Git 2.35.4v2.35.4Johannes Schindelin3-2/+9
2022-06-23Sync with 2.34.4Johannes Schindelin10-12/+275
2022-06-23Git 2.34.4v2.34.4Johannes Schindelin3-2/+8
2022-06-23Sync with 2.33.4Johannes Schindelin9-12/+269
2022-06-23Git 2.33.4v2.33.4Johannes Schindelin3-2/+8
2022-06-23Sync with 2.32.3Johannes Schindelin8-12/+263
2022-06-23Git 2.32.3v2.32.3Johannes Schindelin3-2/+8
2022-06-23Sync with 2.31.4Johannes Schindelin7-12/+257
2022-06-23Git 2.31.4v2.31.4Johannes Schindelin3-2/+8
2022-06-23Sync with 2.30.5Johannes Schindelin6-12/+251
2022-06-23Git 2.30.5v2.30.5Johannes Schindelin3-2/+14
2022-06-23setup: tighten ownership checks post CVE-2022-24765Carlo Marcelo Arenas Belón1-11/+60
2022-06-23Merge branch 'cb/path-owner-check-with-sudo'Junio C Hamano4-1/+179
2022-06-23l10n: po-id for 2.37 (first batch)Bagas Sanjaya1-12673/+12990
2022-06-23l10n: tr: v2.37.0 round #1Emir SARI1-12895/+7746
2022-06-23Merge branch 'master' of github.com:ruester/git-po-deJiang Xin2-13111/+7964
2022-06-23Merge branch 'master' of github.com:alshopov/git-poJiang Xin1-13314/+8766
2022-06-23Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-poJiang Xin1-12744/+13006
2022-06-23l10n: README: fix typoArthur Milchior1-1/+1
2022-06-22revisions.txt: escape "..." to avoid asciidoc horizontal ellipsisJeff King1-1/+1
2022-06-22git-merge-tree.txt: add a section on potentional usage mistakesElijah Newren1-0/+53
2022-06-22merge-tree: add a --allow-unrelated-histories flagElijah Newren3-2/+34
2022-06-22merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren3-5/+62
2022-06-22merge-ort: optionally produce machine-readable outputElijah Newren3-3/+23
2022-06-22merge-ort: store more specific conflict informationElijah Newren1-55/+212
2022-06-22merge-ort: make `path_messages` a strmap to a string_listJohannes Schindelin3-41/+22
2022-06-22merge-ort: store messages in a list, not in a single strbufJohannes Schindelin2-44/+81
2022-06-22merge-tree: provide easy access to `ls-files -u` style infoElijah Newren3-9/+62
2022-06-22merge-tree: provide a list of which files have conflictsElijah Newren3-3/+43
2022-06-22merge-ort: remove command-line-centric submodule message from merge-ortElijah Newren2-9/+2
2022-06-22merge-ort: provide a merge_get_conflicted_files() helper functionElijah Newren2-0/+52
2022-06-22merge-tree: support including merge messages in outputElijah Newren3-8/+97
2022-06-22merge-ort: split out a separate display_update_messages() functionElijah Newren2-37/+49
2022-06-22merge-tree: implement real mergesElijah Newren3-12/+231
2022-06-22merge-tree: add option parsing and initial shell for real merge functionElijah Newren2-10/+76
2022-06-22merge-tree: move logic for existing merge into new functionElijah Newren1-4/+8
2022-06-22merge-tree: rename merge_trees() to trivial_merge_trees()Elijah Newren1-4/+4
generated by cgit (git 2.54.0.dirty) at 2026-09-17 04:37:31 +0000