Commit Graph

  • 8f12108c29 submodule--helper: understand --checkout, --merge and --rebase synonyms Ævar Arnfjörð Bjarmason 2022-06-28 12:05:31 +02:00
  • 36d45163b6 submodule--helper: report "submodule" as our name in some "-h" output Ævar Arnfjörð Bjarmason 2022-06-28 12:05:30 +02:00
  • 6e556c412e submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs" Ævar Arnfjörð Bjarmason 2022-06-28 12:05:29 +02:00
  • 0d68ee723e submodule update: remove "-v" option Ævar Arnfjörð Bjarmason 2022-06-28 12:05:28 +02:00
  • d9c7f69aaa submodule--helper: have --require-init imply --init Ævar Arnfjörð Bjarmason 2022-06-28 12:05:27 +02:00
  • da3aae9e84 git-submodule.sh: remove unused top-level "--branch" argument Ævar Arnfjörð Bjarmason 2022-06-28 12:05:26 +02:00
  • 757d092797 git-submodule.sh: make the "$cached" variable a boolean Ævar Arnfjörð Bjarmason 2022-06-28 12:05:25 +02:00
  • 960fad98e8 git-submodule.sh: remove unused $prefix variable Ævar Arnfjörð Bjarmason 2022-06-28 12:05:24 +02:00
  • 85775255f1 git-submodule.sh: remove unused sanitize_submodule_env() Ævar Arnfjörð Bjarmason 2022-06-28 12:05:23 +02:00
  • 85845580d9 vscode: improve tab size and wrapping Derrick Stolee 2022-06-27 18:29:47 +00:00
  • 69ab3309e9 Sync with Git 2.36.2 Junio C Hamano 2022-06-27 12:36:11 -07:00
  • 8f2441c521 What's cooking (2022/06 #08) Junio C Hamano 2022-06-27 10:10:24 -07:00
  • 5e2ec21174 MaintNotes: 2.37 Junio C Hamano 2022-06-27 09:45:53 -07:00
  • e4a4b31577 Git 2.37 v2.37.0 Junio C Hamano 2022-06-27 09:17:55 -07:00
  • 49c837424a Merge branch 'jc/revert-show-parent-info' Junio C Hamano 2022-06-27 09:13:41 -07:00
  • 5dba4d6540 Merge tag 'l10n-2.37.0-rnd1' of https://github.com/git-l10n/git-po Junio C Hamano 2022-06-27 08:39:10 -07:00
  • fc0f8bcd64 revert: config documentation fixes René Scharfe 2022-06-26 11:29:35 +02:00
  • 71e3a31e40 l10n: sv.po: Update Swedish translation (5367t0f0u) Peter Krefting 2022-06-24 21:23:54 +01:00
  • 11d4c8b350 l10n: ru.po: update Russian translation Dimitriy Ryazantcev 2022-06-20 16:02:39 +03:00
  • e7022fcdb5 Merge branch 'l10n/zh_TW/220623' of github.com:l10n-tw/git-po Jiang Xin 2022-06-26 13:54:26 +08:00
  • c9d5deafe2 l10n: zh_TW: v2.37.0 round 1 Yi-Jyun Pan 2022-06-23 21:08:28 +08:00
  • 0015f897e5 Merge branch 'master' of github.com:vnwildman/git Jiang Xin 2022-06-25 11:01:20 +08:00
  • 84189f4d15 l10n: vi(5367t): Updated translation Tran Ngoc Quan 2022-06-25 08:40:42 +07:00
  • 305136b4ff l10n: fr v2.37 round 1 Jean-Noël Avila 2022-06-24 11:04:25 +02:00
  • a54f9fb9f5 l10n: Update Catalan translation Jordi Mas 2022-06-24 13:30:45 +02:00
  • 39c15e4855 Merge branch 'ab/credentials-in-url-more' Junio C Hamano 2022-06-23 13:22:35 -07:00
  • bcb6cdfc03 Documentation/config/transfer.txt: fix typo Taylor Blau 2022-06-23 15:02:01 -04:00
  • 8cdab69d96 rev-parse: documentation adjustment - mention remote tracking with @{u} Tao Klerks 2022-06-23 05:01:52 +00:00
  • 7d7192b91f Merge branch 'po-id' of github.com:bagasme/git-po Jiang Xin 2022-06-23 21:01:47 +08:00
  • fd59c5bdee Git 2.36.2 v2.36.2 Johannes Schindelin 2022-06-23 12:36:14 +02:00
  • 8f8eea8c3a Sync with 2.35.4 Johannes Schindelin 2022-06-23 12:36:12 +02:00
  • 359da658ae Git 2.35.4 v2.35.4 Johannes Schindelin 2022-06-23 12:36:05 +02:00
  • aef3d5948c Sync with 2.34.4 Johannes Schindelin 2022-06-23 12:36:03 +02:00
  • f2eed22852 Git 2.34.4 v2.34.4 Johannes Schindelin 2022-06-23 12:35:49 +02:00
  • 378eaded1a Sync with 2.33.4 Johannes Schindelin 2022-06-23 12:35:47 +02:00
  • 80c525c4ac Git 2.33.4 v2.33.4 Johannes Schindelin 2022-06-23 12:35:41 +02:00
  • eebfde3f21 Sync with 2.32.3 Johannes Schindelin 2022-06-23 12:35:38 +02:00
  • 656d9a24f6 Git 2.32.3 v2.32.3 Johannes Schindelin 2022-06-23 12:35:32 +02:00
  • fc0c773028 Sync with 2.31.4 Johannes Schindelin 2022-06-23 12:35:30 +02:00
  • 5b1c746c35 Git 2.31.4 v2.31.4 Johannes Schindelin 2022-06-23 12:35:25 +02:00
  • 2f8809f9a1 Sync with 2.30.5 Johannes Schindelin 2022-06-23 12:35:23 +02:00
  • 88b7be68a4 Git 2.30.5 v2.30.5 Johannes Schindelin 2022-05-27 23:38:36 +02:00
  • 3b0bf27049 setup: tighten ownership checks post CVE-2022-24765 Carlo Marcelo Arenas Belón 2022-05-10 12:35:29 -07:00
  • b779214eaf Merge branch 'cb/path-owner-check-with-sudo' Junio C Hamano 2022-05-26 14:51:32 -07:00
  • c38261e7d9 l10n: po-id for 2.37 (first batch) Bagas Sanjaya 2022-06-15 14:33:28 +07:00
  • 160071c38f l10n: tr: v2.37.0 round #1 Emir SARI 2022-06-15 17:48:40 +03:00
  • aa6bc5c581 Merge branch 'master' of github.com:ruester/git-po-de Jiang Xin 2022-06-23 10:45:03 +08:00
  • 241dd998bf Merge branch 'master' of github.com:alshopov/git-po Jiang Xin 2022-06-23 10:44:43 +08:00
  • bf34edf48c Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po Jiang Xin 2022-06-23 10:44:30 +08:00
  • 1b51ae591e l10n: README: fix typo Arthur Milchior 2022-06-22 19:50:44 +00:00
  • 5fd9d1738e revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis Jeff King 2022-06-22 19:33:04 -04:00
  • 7260e87248 git-merge-tree.txt: add a section on potentional usage mistakes Elijah Newren 2022-06-18 00:21:00 +00:00
  • 7976721d17 merge-tree: add a --allow-unrelated-histories flag Elijah Newren 2022-06-18 00:20:59 +00:00
  • 7c48b27822 merge-tree: allow ls-files -u style info to be NUL terminated Elijah Newren 2022-06-18 00:20:58 +00:00
  • de90581141 merge-ort: optionally produce machine-readable output Elijah Newren 2022-06-18 00:20:57 +00:00
  • cb2607759e merge-ort: store more specific conflict information Elijah Newren 2022-06-18 00:20:56 +00:00
  • 2715e8a931 merge-ort: make path_messages a strmap to a string_list Johannes Schindelin 2022-06-18 00:20:55 +00:00
  • 6debb7527b merge-ort: store messages in a list, not in a single strbuf Johannes Schindelin 2022-06-18 00:20:54 +00:00
  • b520bc6caa merge-tree: provide easy access to ls-files -u style info Elijah Newren 2022-06-18 00:20:53 +00:00
  • 7fa3338870 merge-tree: provide a list of which files have conflicts Elijah Newren 2022-06-18 00:20:52 +00:00
  • a4040cfa35 merge-ort: remove command-line-centric submodule message from merge-ort Elijah Newren 2022-06-18 00:20:51 +00:00
  • fae26ce79c merge-ort: provide a merge_get_conflicted_files() helper function Elijah Newren 2022-06-18 00:20:50 +00:00
  • a1a7811975 merge-tree: support including merge messages in output Elijah Newren 2022-06-18 00:20:49 +00:00
  • a34edae68a merge-ort: split out a separate display_update_messages() function Elijah Newren 2022-06-18 00:20:48 +00:00
  • 1f0c3a29da merge-tree: implement real merges Elijah Newren 2022-06-18 00:20:47 +00:00
  • 6ec755a0e1 merge-tree: add option parsing and initial shell for real merge function Elijah Newren 2022-06-18 00:20:46 +00:00
  • 55e48f6bf7 merge-tree: move logic for existing merge into new function Elijah Newren 2022-06-18 00:20:45 +00:00
  • 70176b7015 merge-tree: rename merge_trees() to trivial_merge_trees() Elijah Newren 2022-06-18 00:20:44 +00:00
  • 68437ede53 grep: add --max-count command line option Carlos López 2022-06-22 19:47:32 +00:00
  • f9e6c34c38 What's cooking (2022/06 #07) Junio C Hamano 2022-06-22 11:18:53 -07:00
  • 0411e8aa31 l10n: TEAMS: Change German translation team leader Matthias Rüster 2022-06-21 20:24:14 +02:00
  • 13608fdcfb l10n: de.po: Update German translation Matthias Rüster 2022-06-19 20:55:59 +02:00
  • f770e9f396 Git 2.37-rc2 v2.37.0-rc2 Junio C Hamano 2022-06-22 09:07:56 -07:00
  • b9e4d89ca4 Merge branch 'tb/cruft-packs' Junio C Hamano 2022-06-22 09:06:37 -07:00
  • 4ab814526e l10n: bg.po: Updated Bulgarian translation (5367t) Alexander Shopov 2022-06-12 10:56:04 +02:00
  • db2558009c l10n: zh_CN: v2.37.0 round 1 Fangyi Zhou 2022-06-22 10:28:36 +01:00
  • ce51ed5195 Merge branch 'master' of github.com:git/git Jiang Xin 2022-06-22 15:46:22 +08:00
  • d6c9a71755 dir: minor refactoring / clean-up Goss Geppert 2022-06-16 23:44:33 +00:00
  • 27128996b8 dir: traverse into repository Goss Geppert 2022-06-16 23:19:55 +00:00
  • 2ffb7d13ee t5510: replace 'origin' with URL more carefully Derrick Stolee 2022-06-20 15:52:09 -04:00
  • 817b0f6027 mktree: do not check type of remote objects Richard Oliver 2022-06-21 14:59:39 +01:00
  • ddbc07872e Merge branch 'jp/prompt-clear-before-upstream-mark' Junio C Hamano 2022-06-21 10:07:50 -07:00
  • a1fd2cf8cd i18n: mark message helpers prefix for translation Dimitriy Ryazantcev 2022-06-21 13:57:57 +00:00
  • cfb19ae05f combine-diff: abort if --output is given René Scharfe 2022-06-18 13:12:34 +02:00
  • e3d1be4237 combine-diff: abort if --ignore-matching-lines is given René Scharfe 2022-06-18 13:12:28 +02:00
  • 378b51993a gc: simplify --cruft description René Scharfe 2022-06-19 07:38:50 +02:00
  • 9bef0b1e6e branch: drop unused worktrees variable Jeff King 2022-06-18 23:55:16 -04:00
  • b2463fc30a fetch: stop passing around unused worktrees variable Jeff King 2022-06-18 23:53:19 -04:00
  • 325240dfd7 name-rev: prefix annotate-stdin with '--' in message Alexander Shopov 2022-06-20 18:44:34 +02:00
  • 74e34a0ee2 Merge branch 'master' of github.com:git/git Jiang Xin 2022-06-18 14:02:07 +08:00
  • 4d351f5272 What's cooking (2022/06 #06) Junio C Hamano 2022-06-17 17:36:08 -07:00
  • 5b71c59bc3 Git 2.37-rc1 v2.37.0-rc1 Junio C Hamano 2022-06-17 17:15:13 -07:00
  • 694c0cc0fb Merge branch 'cb/path-owner-check-with-sudo-plus' Junio C Hamano 2022-06-17 17:12:31 -07:00
  • a3ba4fa715 setup: fix function name in a BUG() message Cleber Rosa 2022-06-09 13:55:20 +00:00
  • 82f67ee13f send-pack.c: add config push.useBitmaps Kyle Zhao 2022-06-17 19:06:19 +00:00
  • 6b11e3d52e git-compat-util: allow root to access both SUDO_UID and root owned Carlo Marcelo Arenas Belón 2022-06-17 13:23:38 -07:00
  • b4eda05d58 i18n: fix mismatched camelCase config variables Jiang Xin 2022-06-17 18:03:09 +08:00
  • b81b98f818 Another batch of fixes before -rc1 Junio C Hamano 2022-06-17 10:33:42 -07:00
  • aa11b94ef8 Merge branch 'jk/bug-fl-va-list-fix' Junio C Hamano 2022-06-17 10:33:32 -07:00
  • 7f5a382aa5 Merge branch 'ab/credentials-in-url-more' Junio C Hamano 2022-06-17 10:33:32 -07:00