Commit Graph

  • 1b4d9b4512 Merge branch 'jc/reflog-parse-options' Junio C Hamano 2022-02-05 09:42:31 -08:00
  • 008028a910 Merge branch 'ab/cat-file' Junio C Hamano 2022-02-05 09:42:31 -08:00
  • 66775d2109 Merge branch 'jc/qsort-s-alignment-fix' Junio C Hamano 2022-02-05 09:42:31 -08:00
  • 4bb003d539 Merge branch 'rs/apply-symlinks-use-strset' Junio C Hamano 2022-02-05 09:42:30 -08:00
  • d0bb19cbf7 Merge branch 'rs/grep-expr-cleanup' Junio C Hamano 2022-02-05 09:42:30 -08:00
  • 391d85d78d Merge branch 'jh/p4-spawning-external-commands-cleanup' Junio C Hamano 2022-02-05 09:42:29 -08:00
  • 8b9c425629 Merge branch 'jh/p4-fix-use-of-process-error-exception' Junio C Hamano 2022-02-05 09:42:29 -08:00
  • 492261a6de Merge branch 'jc/find-header' Junio C Hamano 2022-02-05 09:42:29 -08:00
  • 7a9ae6d0d9 Merge branch 'pb/pull-rebase-autostash-fix' Junio C Hamano 2022-02-05 09:42:28 -08:00
  • 3d7e039117 l10n: pt_PT: update TEAMS file Daniel Santos 2022-02-02 22:02:46 +00:00
  • 8af16e2792 l10n: pt_PT: update Portuguese translation Daniel Santos 2021-11-15 12:40:35 +00:00
  • 9164d97a63 i18n: fix some misformated placeholders in command synopsis Jean-Noël Avila 2022-01-31 22:07:49 +00:00
  • 959d670d1a i18n: remove from i18n strings that do not hold translatable parts Jean-Noël Avila 2022-01-31 22:07:48 +00:00
  • 1a8aea857e i18n: factorize "invalid value" messages Jean-Noël Avila 2022-01-31 22:07:47 +00:00
  • a699367bb8 i18n: factorize more 'incompatible options' messages Jean-Noël Avila 2022-01-31 22:07:46 +00:00
  • 0a2bfccb9c t0051: use "skip_all" under !MINGW in single-test file Ævar Arnfjörð Bjarmason 2022-02-04 14:42:14 +01:00
  • 679e3693ab branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks Glen Choo 2022-01-28 16:04:46 -08:00
  • 961b130d20 branch: add --recurse-submodules option for branch creation Glen Choo 2022-01-28 16:04:45 -08:00
  • 5e3eaf38f2 Meta/pushall: make it easier to one-shot customize the destinations Junio C Hamano 2022-02-03 17:20:04 -08:00
  • 58bd20f182 What's cooking (2022/02 #01) Junio C Hamano 2022-02-03 17:19:05 -08:00
  • b3118a56f9 pack-bitmap-write.c: don't return without stop_progress() Ævar Arnfjörð Bjarmason 2022-02-03 22:40:19 +01:00
  • 74900a6b35 progress API: unify stop_progress{,_msg}(), fix trace2 bug Ævar Arnfjörð Bjarmason 2022-02-03 22:40:18 +01:00
  • accf1eb1d0 progress.c: refactor stop_progress{,_msg}() to use helpers Ævar Arnfjörð Bjarmason 2022-02-03 22:40:17 +01:00
  • 1ccad6a1f1 progress.c: use dereferenced "progress" variable, not "(*p_progress)" Ævar Arnfjörð Bjarmason 2022-02-03 22:40:16 +01:00
  • a02014bb4c progress.h: format and be consistent with progress.c naming Ævar Arnfjörð Bjarmason 2022-02-03 22:40:15 +01:00
  • bbfb1c243d progress.c tests: test some invalid usage Ævar Arnfjörð Bjarmason 2022-02-03 22:40:14 +01:00
  • 791afae292 progress.c tests: make start/stop commands on stdin Ævar Arnfjörð Bjarmason 2022-02-03 22:40:13 +01:00
  • 587c3d0da6 progress.c test helper: add missing braces Ævar Arnfjörð Bjarmason 2022-02-03 22:40:12 +01:00
  • 8266e0c029 leak tests: fix a memory leak in "test-progress" helper Ævar Arnfjörð Bjarmason 2022-02-03 22:40:11 +01:00
  • 9325285df4 doc: check-ignore: code-quote an exclamation mark Philip Oakley 2022-02-03 10:16:43 +00:00
  • 45d0212a71 fix typo in git-mktree.txt Liginity Lee 2022-02-02 09:00:50 +00:00
  • d9f88dd8bb completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDS Ævar Arnfjörð Bjarmason 2022-02-02 12:15:10 +01:00
  • 59d9442f28 completion tests: re-source git-completion.bash in a subshell Ævar Arnfjörð Bjarmason 2022-02-02 12:15:09 +01:00
  • cd26cd6c7c t/lib-read-tree-m-3way: indent with tabs Shaoxuan Yuan 2022-02-02 14:43:00 +08:00
  • ddea5719fa t/lib-read-tree-m-3way: modernize style Shaoxuan Yuan 2022-02-02 14:42:59 +08:00
  • 74f3390dde builtin/diff.c: fix "git-diff" usage string typo Shaoxuan Yuan 2022-02-02 15:28:44 +08:00
  • 757e75c81e patch-id: fix scan_hunk_header on diffs with 1 line of before/after Jerry Zhang 2022-02-01 20:19:45 -08:00
  • 56fa5ac39a patch-id: fix antipatterns in tests Jerry Zhang 2022-02-01 20:20:15 -08:00
  • 0dec322d31 diff-merges: avoid history simplifications when diffing merges Elijah Newren 2022-02-02 02:37:37 +00:00
  • 0d83d8240d merge-ort: mark conflict/warning messages from inner merges as omittable Elijah Newren 2022-02-02 02:37:36 +00:00
  • 20323d104e show, log: include conflict/warning messages in --remerge-diff headers Elijah Newren 2022-02-02 02:37:35 +00:00
  • 95433eeed9 diff: add ability to insert additional headers for paths Elijah Newren 2022-02-02 02:37:34 +00:00
  • 6054d1aac3 merge-ort: format messages slightly different for use in headers Elijah Newren 2022-02-02 02:37:33 +00:00
  • a28d094ac2 merge-ort: mark a few more conflict messages as omittable Elijah Newren 2022-02-02 02:37:32 +00:00
  • 24dbdab50d merge-ort: capture and print ll-merge warnings in our preferred fashion Elijah Newren 2022-02-02 02:37:31 +00:00
  • 35f6967161 ll-merge: make callers responsible for showing warnings Elijah Newren 2022-02-02 02:37:30 +00:00
  • 7b90ab467a log: clean unneeded objects during log --remerge-diff Elijah Newren 2022-02-02 02:37:29 +00:00
  • db757e8b8d show, log: provide a --remerge-diff capability Elijah Newren 2022-02-02 02:37:28 +00:00
  • 714edc620c repo-settings: rename the traditional default fetch.negotiationAlgorithm Elijah Newren 2022-02-02 03:42:40 +00:00
  • a9a136c232 repo-settings: fix error handling for unknown values Elijah Newren 2022-02-02 03:42:39 +00:00
  • a68c5b9eba repo-settings: fix checking for fetch.negotiationAlgorithm=default Elijah Newren 2022-02-02 03:42:38 +00:00
  • 6798b08e84 perl Git.pm: don't ignore signalled failure in _cmd_close() Ævar Arnfjörð Bjarmason 2022-02-01 21:52:52 +01:00
  • 5407764069 receive-pack: purge temporary data if no command is ready to run Chen Bojun 2022-01-29 14:35:38 +08:00
  • 6e0a2ca027 builtin/branch: consolidate action-picking logic in cmd_branch() Glen Choo 2022-01-28 16:04:44 -08:00
  • 3f3e76082b branch: add a dry_run parameter to create_branch() Glen Choo 2022-01-28 16:04:43 -08:00
  • bc0893cf3b branch: make create_branch() always create a branch Glen Choo 2022-01-28 16:04:42 -08:00
  • e89f151db1 branch: move --set-upstream-to behavior to dwim_and_setup_tracking() Glen Choo 2022-01-28 16:04:41 -08:00
  • 9158a3564a subtree: force merge commit Thomas Koutcher 2022-02-01 18:26:04 +01:00
  • eaf0e83009 t5312: prepare for reftable Han-Wen Nienhuys 2022-01-31 17:50:20 +00:00
  • 53af25e47c t1405: mark test that checks existence as REFFILES Han-Wen Nienhuys 2022-01-31 17:50:19 +00:00
  • 5e00514745 t1405: explictly delete reflogs for reftable Han-Wen Nienhuys 2022-01-31 17:50:18 +00:00
  • c9e04d905e fetch --prune: exit with error if pruning fails Thomas Gummerer 2022-01-31 13:30:47 +00:00
  • 09e0be130d Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules Junio C Hamano 2022-01-31 10:37:44 -08:00
  • 5d01301f2b Sync with Git 2.35.1 Junio C Hamano 2022-01-28 16:58:04 -08:00
  • 90fb70e458 Name the next one 2.36 to prepare for 2.35.1 Junio C Hamano 2022-01-28 16:57:10 -08:00
  • 4c53a8c20f Git 2.35.1 v2.35.1 Junio C Hamano 2022-01-28 16:48:42 -08:00
  • f120b65cd4 Merge branch 'en/keep-cwd' into maint Junio C Hamano 2022-01-28 16:45:39 -08:00
  • 2ae8eb5d71 scalar: accept -C and -c options before the subcommand Johannes Schindelin 2022-01-28 14:31:57 +00:00
  • 2826ffad8c fetch: fix negotiate-only error message Robert Coup 2022-01-28 14:36:02 +00:00
  • 0f03f04c5c sparse-checkout: fix a couple minor memory leaks Elijah Newren 2022-01-28 01:58:18 +00:00
  • 75408ca949 diff-filter: be more careful when looking for negative bits Johannes Schindelin 2022-01-28 12:02:50 +00:00
  • 4d4d4eaa7b diff.c: move the diff filter bits definitions up a bit Johannes Schindelin 2022-01-28 12:02:49 +00:00
  • d843e319f8 docs(diff): lose incorrect claim about diff-files --diff-filter=A Johannes Schindelin 2022-01-28 12:02:48 +00:00
  • e9b272e4c1 stash: stop warning about the obsolete stash.useBuiltin config setting Johannes Schindelin 2022-01-27 22:03:51 +00:00
  • deeaf5ee07 stash: remove documentation for stash.useBuiltin Johannes Schindelin 2022-01-27 22:03:50 +00:00
  • 5d4dc38bfd add: remove support for git-legacy-stash Johannes Schindelin 2022-01-27 22:03:49 +00:00
  • 6de07229ac git-sh-setup: remove remnant bits referring to git-legacy-stash Johannes Schindelin 2022-01-27 22:03:48 +00:00
  • cdba0295b0 SubmittingPatches: explain why we care about log messages Junio C Hamano 2022-01-27 11:02:59 -08:00
  • 607817a3c8 CodingGuidelines: hint why we value clearly written log messages Junio C Hamano 2022-01-27 11:02:58 -08:00
  • fa1101afb6 SubmittingPatches: write problem statement in the log in the present tense Junio C Hamano 2022-01-27 11:02:57 -08:00
  • 3a73c1dfaf object-name: re-use "struct strbuf" in show_ambiguous_object() Ævar Arnfjörð Bjarmason 2022-01-27 06:26:49 +01:00
  • d2ef3cb7e2 object-name: iterate ambiguous objects before showing header Ævar Arnfjörð Bjarmason 2022-01-27 06:26:48 +01:00
  • 851b3d7671 object-name: show date for ambiguous tag objects Ævar Arnfjörð Bjarmason 2022-01-27 06:26:47 +01:00
  • ba5e8a0eb8 object-name: make ambiguous object output translatable Ævar Arnfjörð Bjarmason 2022-01-27 06:26:46 +01:00
  • 667a560be7 object-name: explicitly handle bad tags in show_ambiguous_object() Ævar Arnfjörð Bjarmason 2022-01-27 06:26:45 +01:00
  • 6780e68040 object-name: explicitly handle OBJ_BAD in show_ambiguous_object() Ævar Arnfjörð Bjarmason 2022-01-27 06:26:44 +01:00
  • 8d56136d03 object-name tests: add tests for ambiguous object blind spots Ævar Arnfjörð Bjarmason 2022-01-27 06:26:43 +01:00
  • f8b60cf99b pack-bitmap.c: gracefully fallback after opening pack/MIDX Taylor Blau 2022-01-25 17:41:20 -05:00
  • 7f514b7a5e midx: read RIDX chunk when present Taylor Blau 2022-01-25 17:41:17 -05:00
  • a80f0f91b1 t/lib-bitmap.sh: parameterize tests over reverse index source Taylor Blau 2022-01-25 17:41:15 -05:00
  • 791170fa2b t5326: move tests to t/lib-bitmap.sh Taylor Blau 2022-01-25 17:41:13 -05:00
  • f0ed59afcc t5326: extract test_rev_exists Taylor Blau 2022-01-25 17:41:10 -05:00
  • 90a8ea47d8 t5326: drop unnecessary setup Taylor Blau 2022-01-25 17:41:08 -05:00
  • 09a77999e7 pack-revindex.c: instrument loading on-disk reverse index Taylor Blau 2022-01-25 17:41:05 -05:00
  • 95e8383bac midx.c: make changing the preferred pack safe Taylor Blau 2022-01-25 17:41:03 -05:00
  • 61fd31a179 t5326: demonstrate bitmap corruption after permutation Taylor Blau 2022-01-25 17:41:01 -05:00
  • b23dac905b Merge branch 'en/keep-cwd' Junio C Hamano 2022-01-26 22:22:24 -08:00
  • 7747e12d71 Start post 2.35 cycle Junio C Hamano 2022-01-26 22:21:01 -08:00
  • cbac0076ef Documentation/config/pgp.txt: add missing apostrophe Greg Hurrell 2022-01-26 13:14:26 +01:00
  • 7838d9c2a9 Documentation/config/pgp.txt: replace stray <TAB> character with <SPC> Greg Hurrell 2022-01-26 13:14:25 +01:00