From 2a04e8c293766a4976ceceb4c663dd2963e0339e Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Thu, 23 Oct 2025 09:50:14 +0200 Subject: [PATCH 001/237] last-modified: implement faster algorithm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current implementation of git-last-modified(1) works by doing a revision walk, and inspecting the diff at each level of that walk to annotate entries remaining in the hashmap of paths. In other words, if the diff at some level touches a path which has not yet been associated with a commit, then that commit becomes associated with the path. While a perfectly reasonable implementation, it can perform poorly in either one of two scenarios: 1. There are many entries of interest, in which case there is simply a lot of work to do. 2. Or, there are (even a few) entries which have not been updated in a long time, and so we must walk through a lot of history in order to find a commit that touches that path. This patch rewrites the last-modified implementation that addresses the second point. The idea behind the algorithm is to propagate a set of 'active' paths (a path is 'active' if it does not yet belong to a commit) up to parents and do a truncated revision walk. The walk is truncated because it does not produce a revision for every change in the original pathspec, but rather only for active paths. More specifically, consider a priority queue of commits sorted by generation number. First, enqueue the set of boundary commits with all paths in the original spec marked as interesting. Then, while the queue is not empty, do the following: 1. Pop an element, say, 'c', off of the queue, making sure that 'c' isn't reachable by anything in the '--not' set. 2. For each parent 'p' (with index 'parent_i') of 'c', do the following: a. Compute the diff between 'c' and 'p'. b. Pass any active paths that are TREESAME from 'c' to 'p'. c. If 'p' has any active paths, push it onto the queue. 3. Any path that remains active on 'c' is associated to that commit. This ends up being equivalent to doing something like 'git log -1 -- $path' for each path simultaneously. But, it allows us to go much faster than the original implementation by limiting the number of diffs we compute, since we can avoid parts of history that would have been considered by the revision walk in the original implementation, but are known to be uninteresting to us because we have already marked all paths in that area to be inactive. To avoid computing many first-parent diffs, add another trick on top of this and check if all paths active in 'c' are DEFINITELY NOT in c's Bloom filter. Since the commit-graph only stores first-parent diffs in the Bloom filters, we can only apply this trick to first-parent diffs. Comparing the performance of this new algorithm shows about a 2.5x improvement on git.git: Benchmark 1: master no bloom Time (mean ± σ): 2.868 s ± 0.023 s [User: 2.811 s, System: 0.051 s] Range (min … max): 2.847 s … 2.926 s 10 runs Benchmark 2: master with bloom Time (mean ± σ): 949.9 ms ± 15.2 ms [User: 907.6 ms, System: 39.5 ms] Range (min … max): 933.3 ms … 971.2 ms 10 runs Benchmark 3: HEAD no bloom Time (mean ± σ): 782.0 ms ± 6.3 ms [User: 740.7 ms, System: 39.2 ms] Range (min … max): 776.4 ms … 798.2 ms 10 runs Benchmark 4: HEAD with bloom Time (mean ± σ): 307.1 ms ± 1.7 ms [User: 276.4 ms, System: 29.9 ms] Range (min … max): 303.7 ms … 309.5 ms 10 runs Summary HEAD with bloom ran 2.55 ± 0.02 times faster than HEAD no bloom 3.09 ± 0.05 times faster than master with bloom 9.34 ± 0.09 times faster than master no bloom In short, the existing implementation is comparably fast *with* Bloom filters as the new implementation is *without* Bloom filters. So, most repositories should get a dramatic speed-up by just deploying this (even without computing Bloom filters), and all repositories should get faster still when computing Bloom filters. When comparing a more extreme example of `git last-modified -- COPYING t`, the difference is even 5 times better: Benchmark 1: master Time (mean ± σ): 4.372 s ± 0.057 s [User: 4.286 s, System: 0.062 s] Range (min … max): 4.308 s … 4.509 s 10 runs Benchmark 2: HEAD Time (mean ± σ): 826.3 ms ± 22.3 ms [User: 784.1 ms, System: 39.2 ms] Range (min … max): 810.6 ms … 881.2 ms 10 runs Summary HEAD ran 5.29 ± 0.16 times faster than master As an added benefit, results are more consistent now. For example implementation in 'master' gives: $ git log --max-count=1 --format=%H -- pkt-line.h 15df15fe07ef66b51302bb77e393f3c5502629de $ git last-modified -- pkt-line.h 15df15fe07ef66b51302bb77e393f3c5502629de pkt-line.h $ git last-modified | grep pkt-line.h 5b49c1af03e600c286f63d9d9c9fb01403230b9f pkt-line.h With the changes in this patch the results of git-last-modified(1) always match those of `git log --max-count=1`. One thing to note though, the results might be outputted in a different order than before. This is not considerd to be an issue because nowhere is documented the order is guaranteed. Based-on-patches-by: Derrick Stolee Based-on-patches-by: Taylor Blau Signed-off-by: Taylor Blau Signed-off-by: Toon Claes Acked-by: Taylor Blau [jc: tweaked use of xcalloc() to unbreak coccicheck] Signed-off-by: Junio C Hamano --- builtin/last-modified.c | 250 ++++++++++++++++++++++++++++++++++++--- object.h | 1 + t/t8020-last-modified.sh | 2 +- 3 files changed, 237 insertions(+), 16 deletions(-) diff --git a/builtin/last-modified.c b/builtin/last-modified.c index ae8b36a2c3515c..b0ecbdc5400d13 100644 --- a/builtin/last-modified.c +++ b/builtin/last-modified.c @@ -2,26 +2,32 @@ #include "bloom.h" #include "builtin.h" #include "commit-graph.h" +#include "commit-slab.h" #include "commit.h" #include "config.h" -#include "environment.h" #include "diff.h" #include "diffcore.h" #include "environment.h" +#include "ewah/ewok.h" #include "hashmap.h" #include "hex.h" -#include "log-tree.h" #include "object-name.h" #include "object.h" #include "parse-options.h" +#include "prio-queue.h" #include "quote.h" #include "repository.h" #include "revision.h" +/* Remember to update object flag allocation in object.h */ +#define PARENT1 (1u<<16) /* used instead of SEEN */ +#define PARENT2 (1u<<17) /* used instead of BOTTOM, BOUNDARY */ + struct last_modified_entry { struct hashmap_entry hashent; struct object_id oid; struct bloom_key key; + size_t diff_idx; const char path[FLEX_ARRAY]; }; @@ -37,13 +43,45 @@ static int last_modified_entry_hashcmp(const void *unused UNUSED, return strcmp(ent1->path, path ? path : ent2->path); } +/* + * Hold a bitmap for each commit we're working with. In the bitmap, each bit + * represents a path in `lm->all_paths`. An active bit indicates the path still + * needs to be associated to a commit. + */ +define_commit_slab(active_paths_for_commit, struct bitmap *); + struct last_modified { struct hashmap paths; struct rev_info rev; bool recursive; bool show_trees; + + const char **all_paths; + size_t all_paths_nr; + struct active_paths_for_commit active_paths; + + /* 'scratch' to avoid allocating a bitmap every process_parent() */ + struct bitmap *scratch; }; +static struct bitmap *active_paths_for(struct last_modified *lm, struct commit *c) +{ + struct bitmap **bitmap = active_paths_for_commit_at(&lm->active_paths, c); + if (!*bitmap) + *bitmap = bitmap_word_alloc(lm->all_paths_nr / BITS_IN_EWORD + 1); + + return *bitmap; +} + +static void active_paths_free(struct last_modified *lm, struct commit *c) +{ + struct bitmap **bitmap = active_paths_for_commit_at(&lm->active_paths, c); + if (*bitmap) { + bitmap_free(*bitmap); + *bitmap = NULL; + } +} + static void last_modified_release(struct last_modified *lm) { struct hashmap_iter iter; @@ -54,6 +92,8 @@ static void last_modified_release(struct last_modified *lm) hashmap_clear_and_free(&lm->paths, struct last_modified_entry, hashent); release_revisions(&lm->rev); + + free(lm->all_paths); } struct last_modified_callback_data { @@ -146,7 +186,7 @@ static void mark_path(const char *path, const struct object_id *oid, * Is it arriving at a version of interest, or is it from a side branch * which did not contribute to the final state? */ - if (!oideq(oid, &ent->oid)) + if (oid && !oideq(oid, &ent->oid)) return; last_modified_emit(data->lm, path, data->commit); @@ -196,7 +236,17 @@ static void last_modified_diff(struct diff_queue_struct *q, } } -static bool maybe_changed_path(struct last_modified *lm, struct commit *origin) +static void pass_to_parent(struct bitmap *c, + struct bitmap *p, + size_t pos) +{ + bitmap_unset(c, pos); + bitmap_set(p, pos); +} + +static bool maybe_changed_path(struct last_modified *lm, + struct commit *origin, + struct bitmap *active) { struct bloom_filter *filter; struct last_modified_entry *ent; @@ -213,6 +263,9 @@ static bool maybe_changed_path(struct last_modified *lm, struct commit *origin) return true; hashmap_for_each_entry(&lm->paths, &iter, ent, hashent) { + if (active && !bitmap_get(active, ent->diff_idx)) + continue; + if (bloom_filter_contains(filter, &ent->key, lm->rev.bloom_filter_settings)) return true; @@ -220,42 +273,202 @@ static bool maybe_changed_path(struct last_modified *lm, struct commit *origin) return false; } +static void process_parent(struct last_modified *lm, + struct prio_queue *queue, + struct commit *c, struct bitmap *active_c, + struct commit *parent, int parent_i) +{ + struct bitmap *active_p; + + repo_parse_commit(lm->rev.repo, parent); + active_p = active_paths_for(lm, parent); + + /* + * The first time entering this function for this commit (i.e. first parent) + * see if Bloom filters will tell us it's worth to do the diff. + */ + if (parent_i || maybe_changed_path(lm, c, active_c)) { + diff_tree_oid(&parent->object.oid, + &c->object.oid, "", &lm->rev.diffopt); + diffcore_std(&lm->rev.diffopt); + } + + /* + * Test each path for TREESAME-ness against the parent. If a path is + * TREESAME, pass it on to this parent. + * + * First, collect all paths that are *not* TREESAME in 'scratch'. + * Then, pass paths that *are* TREESAME and active to the parent. + */ + for (int i = 0; i < diff_queued_diff.nr; i++) { + struct diff_filepair *fp = diff_queued_diff.queue[i]; + const char *path = fp->two->path; + struct last_modified_entry *ent = + hashmap_get_entry_from_hash(&lm->paths, strhash(path), path, + struct last_modified_entry, hashent); + if (ent) { + size_t k = ent->diff_idx; + if (bitmap_get(active_c, k)) + bitmap_set(lm->scratch, k); + } + } + for (size_t i = 0; i < lm->all_paths_nr; i++) { + if (bitmap_get(active_c, i) && !bitmap_get(lm->scratch, i)) + pass_to_parent(active_c, active_p, i); + } + + /* + * If parent has any active paths, put it on the queue (if not already). + */ + if (!bitmap_is_empty(active_p) && !(parent->object.flags & PARENT1)) { + parent->object.flags |= PARENT1; + prio_queue_put(queue, parent); + } + if (!(parent->object.flags & PARENT1)) + active_paths_free(lm, parent); + + memset(lm->scratch->words, 0x0, lm->scratch->word_alloc); + diff_queue_clear(&diff_queued_diff); +} + static int last_modified_run(struct last_modified *lm) { + int max_count, queue_popped = 0; + struct prio_queue queue = { compare_commits_by_gen_then_commit_date }; + struct prio_queue not_queue = { compare_commits_by_gen_then_commit_date }; + struct commit_list *list; struct last_modified_callback_data data = { .lm = lm }; lm->rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; lm->rev.diffopt.format_callback = last_modified_diff; lm->rev.diffopt.format_callback_data = &data; + lm->rev.no_walk = 1; prepare_revision_walk(&lm->rev); - while (hashmap_get_size(&lm->paths)) { - data.commit = get_revision(&lm->rev); - if (!data.commit) - BUG("paths remaining beyond boundary in last-modified"); + max_count = lm->rev.max_count; + + init_active_paths_for_commit(&lm->active_paths); + lm->scratch = bitmap_word_alloc(lm->all_paths_nr); + + /* + * lm->rev.commits holds the set of boundary commits for our walk. + * + * Loop through each such commit, and place it in the appropriate queue. + */ + for (list = lm->rev.commits; list; list = list->next) { + struct commit *c = list->item; + + if (c->object.flags & BOTTOM) { + prio_queue_put(¬_queue, c); + c->object.flags |= PARENT2; + } else if (!(c->object.flags & PARENT1)) { + /* + * If the commit is a starting point (and hasn't been + * seen yet), then initialize the set of interesting + * paths, too. + */ + struct bitmap *active; + + prio_queue_put(&queue, c); + c->object.flags |= PARENT1; + + active = active_paths_for(lm, c); + for (size_t i = 0; i < lm->all_paths_nr; i++) + bitmap_set(active, i); + } + } - if (data.commit->object.flags & BOUNDARY) { + while (queue.nr) { + int parent_i; + struct commit_list *p; + struct commit *c = prio_queue_get(&queue); + struct bitmap *active_c = active_paths_for(lm, c); + + if ((0 <= max_count && max_count < ++queue_popped) || + (c->object.flags & PARENT2)) { + /* + * Either a boundary commit, or we have already seen too + * many others. Either way, stop here. + */ + c->object.flags |= PARENT2 | BOUNDARY; + data.commit = c; diff_tree_oid(lm->rev.repo->hash_algo->empty_tree, - &data.commit->object.oid, "", - &lm->rev.diffopt); + &c->object.oid, + "", &lm->rev.diffopt); diff_flush(&lm->rev.diffopt); + goto cleanup; + } - break; + /* + * Otherwise, make sure that 'c' isn't reachable from anything + * in the '--not' queue. + */ + repo_parse_commit(lm->rev.repo, c); + + while (not_queue.nr) { + struct commit_list *np; + struct commit *n = prio_queue_get(¬_queue); + + repo_parse_commit(lm->rev.repo, n); + + for (np = n->parents; np; np = np->next) { + if (!(np->item->object.flags & PARENT2)) { + prio_queue_put(¬_queue, np->item); + np->item->object.flags |= PARENT2; + } + } + + if (commit_graph_generation(n) < commit_graph_generation(c)) + break; } - if (!maybe_changed_path(lm, data.commit)) - continue; + /* + * Look at each parent and pass on each path that's TREESAME + * with that parent. Stop early when no active paths remain. + */ + for (p = c->parents, parent_i = 0; p; p = p->next, parent_i++) { + process_parent(lm, &queue, + c, active_c, + p->item, parent_i); + + if (bitmap_is_empty(active_c)) + break; + } + + /* + * Paths that remain active, or not TREESAME with any parent, + * were changed by 'c'. + */ + if (!bitmap_is_empty(active_c)) { + data.commit = c; + for (size_t i = 0; i < lm->all_paths_nr; i++) { + if (bitmap_get(active_c, i)) + mark_path(lm->all_paths[i], NULL, &data); + } + } - log_tree_commit(&lm->rev, data.commit); +cleanup: + active_paths_free(lm, c); } + if (hashmap_get_size(&lm->paths)) + BUG("paths remaining beyond boundary in last-modified"); + + clear_prio_queue(¬_queue); + clear_prio_queue(&queue); + clear_active_paths_for_commit(&lm->active_paths); + bitmap_free(lm->scratch); + return 0; } static int last_modified_init(struct last_modified *lm, struct repository *r, const char *prefix, int argc, const char **argv) { + struct hashmap_iter iter; + struct last_modified_entry *ent; + hashmap_init(&lm->paths, last_modified_entry_hashcmp, NULL, 0); repo_init_revisions(r, &lm->rev, prefix); @@ -280,6 +493,13 @@ static int last_modified_init(struct last_modified *lm, struct repository *r, if (populate_paths_from_revs(lm) < 0) return error(_("unable to setup last-modified")); + CALLOC_ARRAY(lm->all_paths, hashmap_get_size(&lm->paths)); + lm->all_paths_nr = 0; + hashmap_for_each_entry(&lm->paths, &iter, ent, hashent) { + ent->diff_idx = lm->all_paths_nr++; + lm->all_paths[ent->diff_idx] = ent->path; + } + return 0; } diff --git a/object.h b/object.h index 8c3c1c46e1bf04..fa504a09c0a48d 100644 --- a/object.h +++ b/object.h @@ -75,6 +75,7 @@ void object_array_init(struct object_array *array); * http-push.c: 11-----14 * commit-graph.c: 15 * commit-reach.c: 16-----19 + * builtin/last-modified.c: 1617 * sha1-name.c: 20 * list-objects-filter.c: 21 * bloom.c: 2122 diff --git a/t/t8020-last-modified.sh b/t/t8020-last-modified.sh index 61f00bc15c3b2d..a4c1114ee28f7f 100755 --- a/t/t8020-last-modified.sh +++ b/t/t8020-last-modified.sh @@ -57,9 +57,9 @@ test_expect_success 'last-modified recursive' ' test_expect_success 'last-modified recursive with show-trees' ' check_last_modified -r -t <<-\EOF - 3 a 3 a/b 3 a/b/file + 3 a 2 a/file 1 file EOF From b095b7d15937d92e9f9eae5a8f4151ec6dece159 Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Fri, 7 Nov 2025 15:54:20 +0100 Subject: [PATCH 002/237] l10n: sv.po: Update Swedish translation Signed-off-by: Peter Krefting --- po/sv.po | 1418 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 1167 insertions(+), 251 deletions(-) diff --git a/po/sv.po b/po/sv.po index 5ee10ac0454e52..a7ae9729af175e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.51.0\n" +"Project-Id-Version: git 2.52.0\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2025-08-14 09:52+0100\n" -"PO-Revision-Date: 2025-08-14 09:53+0100\n" +"POT-Creation-Date: 2025-11-06 23:58+0000\n" +"PO-Revision-Date: 2025-11-07 15:54+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Svenska \n" "Language: sv\n" @@ -16,7 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 42.0\n" #, c-format msgid "%s cannot be negative" @@ -538,37 +537,39 @@ msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" +"j - go to the next undecided hunk, roll over at the bottom\n" +"J - go to the next hunk, roll over at the bottom\n" +"k - go to the previous undecided hunk, roll over at the top\n" +"K - go to the previous hunk, roll over at the top\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk, 'P' to use the pager\n" +"p - print the current hunk\n" +"P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j - lämna stycket obestämt, se nästa obestämda stycke\n" -"J - lämna stycket obestämt, se nästa stycke\n" -"k - lämna stycket obestämt, se föregående obestämda stycke\n" -"K - lämna stycket obestämt, se föregående stycke\n" +"j - gå till nästa obestämda stycke, börja om vid slutet\n" +"J - gå till nästa stycke, börja om vid slutet\n" +"k - gå till föregående obestämda stycke, börja om vid början\n" +"K - gå till föregående styckem, börja om vid början\n" "g - välj ett stycke att gå till\n" "/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n" "s - dela aktuellt stycke i mindre styckens\n" "e - redigera aktuellt stycke manuellt\n" -"p - visa aktuellt stycke, ”P” för att använda bläddrare\n" +"p - visa aktuellt stycke\n" +"P - visa aktuellt stycke i bläddrare\n" "? - visa hjälp\n" #, c-format msgid "Only one letter is expected, got '%s'" msgstr "Förväntade endast en bokstav, fick ”%s”" -msgid "No previous hunk" -msgstr "Inget föregående stycke" +msgid "No other hunk" +msgstr "Inget annat stycke" -msgid "No next hunk" -msgstr "Inget följande stycke" +msgid "No other undecided hunk" +msgstr "Inget annat obestämt stycke" msgid "No other hunks to goto" msgstr "Inga andra stycken att gå till" @@ -2337,14 +2338,20 @@ msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Begränsa saknade objekt till befintlig ”sparse-checkout”" msgid "" -"git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" -"checkout] [--first-parent] [ [...]] [--] [...]" +"git bisect start [--term-(bad|new)= --term-(good|old)=]\n" +" [--no-checkout] [--first-parent] [ [...]] [--] " +"[...]" msgstr "" -"git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" -"checkout] [--first-parent] [ [...]] [--] [...]" +"git bisect start [--term-(bad|new)= --term-(good|old)=]\n" +" [--no-checkout] [--first-parent] [ [...]] [--] " +"[...]" + +msgid "git bisect (bad|new|) []" +msgstr "git bisect (bad|new|) []" -msgid "git bisect (good|bad) [...]" -msgstr "git bisect (good|bad) [...]" +msgid "git bisect (good|old|) [...]" +msgstr "git bisect (good|old|) [...]" msgid "git bisect skip [(|)...]" msgstr "git bisect skip [(|)...]" @@ -3001,11 +3008,11 @@ msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" msgid "" -"branch with --recurse-submodules can only be used if submodule." -"propagateBranches is enabled" +"branch with --recurse-submodules can only be used if " +"submodule.propagateBranches is enabled" msgstr "" -"gren med --recurse-submodules kan endast användas om submodule." -"propagateBranches har aktiverats" +"gren med --recurse-submodules kan endast användas om " +"submodule.propagateBranches har aktiverats" msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules kan endast användas för att skapa grenar" @@ -5518,6 +5525,14 @@ msgstr "traverserade %lu incheckningar\n" msgid "found %i tags; gave up search at %s\n" msgstr "hittade %i taggar; gav upp sökning vid %s\n" +#, c-format +msgid "cannot search for blob '%s' on an unborn branch" +msgstr "kan inte leta efter ”%s” på en ofödd gren" + +#, c-format +msgid "blob '%s' not reachable from HEAD" +msgstr "blob:en ”%s” kan inte nås från HEAD" + #, c-format msgid "describe %s\n" msgstr "beskriva %s\n" @@ -5658,6 +5673,9 @@ msgstr "ogiltig flagga: %s" msgid "%s...%s: no merge base" msgstr "%s...%s: ingen sammanslagningsbas" +msgid "cannot come back to cwd" +msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)" + msgid "Not a git repository" msgstr "Inte ett git-arkiv" @@ -5768,8 +5786,139 @@ msgstr "inget angavs för --extcmd=" msgid "git fast-export []" msgstr "git fast-export []" -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges." +#, c-format +msgid "unknown %s mode: %s" +msgstr "okänd läge för %s: %s" + +#, c-format +msgid "unknown tag-of-filtered mode: %s" +msgstr "okänt läge för tag-of-filtered: %s" + +#, c-format +msgid "unknown reencoding mode: %s" +msgstr "okänt läge för reencode: %s" + +#, c-format +msgid "could not read blob %s" +msgstr "kunde inte läsa blob:en %s" + +#, c-format +msgid "oid mismatch in blob %s" +msgstr "oid stämmer inte överens i blob:en %s" + +#, c-format +msgid "could not write blob '%s'" +msgstr "kunde inte skriva blob:en ”%s”" + +#, c-format +msgid "unexpected comparison status '%c' for %s, %s" +msgstr "jämförelsesstatus ”%c” förväntades inte för %s, %s" + +msgid "none" +msgstr "ingen" + +#, c-format +msgid "could not find author in commit %s" +msgstr "kunde inte hitta författare i incheckningen %s" + +#, c-format +msgid "could not find committer in commit %s" +msgstr "kunde inte hitta incheckare i incheckningen %s" + +#, c-format +msgid "" +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" +"no] to handle it" +msgstr "" +"påträffade incheckningsspecifik teckenkodning %.*s i incheckningen %s; " +"använd --reencode=[yes|no] för att hantera den" + +#, c-format +msgid "encountered signed commit %s; use --signed-commits= to handle it" +msgstr "" +"påträffade en signerad incheckning %s; använd --signed-commits= för " +"att hantera den" + +#, c-format +msgid "exporting % signature(s) for commit %s" +msgstr "exporterar % signatur(er) för incheckningen %s" + +#, c-format +msgid "stripping signature(s) from commit %s" +msgstr "tar bort signatur(er) från incheckning %s" + +#, c-format +msgid "" +"omitting tag %s,\n" +"since tags of trees (or tags of tags of trees, etc.) are not supported." +msgstr "" +"utelämnar taggen %s,\n" +"eftersom taggar för träd (eller taggar för taggar för träd, osv.) inte stöds." + +#, c-format +msgid "could not read tag %s" +msgstr "kunde inte läsa taggen %s" + +#, c-format +msgid "encountered signed tag %s; use --signed-tags= to handle it" +msgstr "" +"påträffade signerade taggen %s; använd --signed-tags= för att hantera " +"den" + +#, c-format +msgid "exporting signed tag %s" +msgstr "exporterar signerad tagg %s" + +#, c-format +msgid "stripping signature from tag %s" +msgstr "tar bort signatur från taggen %s" + +#, c-format +msgid "" +"tag %s tags unexported object; use --tag-of-filtered-object= to handle " +"it" +msgstr "" +"taggen %s taggar et oexporterat objekt; använd --tag-of-filtered-" +"object= för att hantera det" + +msgid "cannot export nested tags unless --mark-tags is specified." +msgstr "kan inte exportera nästlade taggar såvida inte --mark-tags anges." + +#, c-format +msgid "tag %s points nowhere?" +msgstr "taggen %s pekar ingenstans?" + +#, c-format +msgid "%s: unexpected object of type %s, skipping." +msgstr "%s: förväntade inte objekt av typen %s, hoppar över." + +#, c-format +msgid "tag points to object of unexpected type %s, skipping." +msgstr "taggen pekar på objekt av typ som inte förväntades %s, hoppar över." + +#, c-format +msgid "unable to open marks file %s for writing." +msgstr "kan inte öppna märkesfilen %s för skrivning" + +#, c-format +msgid "unable to write marks file %s." +msgstr "kan inte skriva märkesfilen %s" + +#, c-format +msgid "corrupt mark line: %s" +msgstr "trasig märkesrad: %s" + +#, c-format +msgid "object not found: %s" +msgstr "objektet hittades inte: %s" + +#, c-format +msgid "not a commit? can't happen: %s" +msgstr "inte en incheckning? kan inte hända: %s" + +#, c-format +msgid "object %s already has a mark" +msgstr "objektet %s har redan ett märke" msgid "--anonymize-map token cannot be empty" msgstr "symbolen för --anonymize-map kan inte vara tom" @@ -5835,28 +5984,455 @@ msgid "label tags with mark ids" msgstr "märk taggar med märke-id" #, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "Saknar från-märken för undermodulen ”%s”" +msgid "can't write crash report %s" +msgstr "kan inte skriva kraschrapporten %s" + +#, c-format +msgid "fast-import: dumping crash report to %s\n" +msgstr "fast-import: skriver kraschrapport till %s\n" + +#, c-format +msgid "mark :% not declared" +msgstr "märket :% har inte deklarerats" + +#, c-format +msgid "invalid attempt to create duplicate branch: %s" +msgstr "ogiltigt försök att skapa duplicerad gren: %s" + +#, c-format +msgid "branch name doesn't conform to Git standards: %s" +msgstr "grenens namn är inte giltigt i Git: %s" + +msgid "internal consistency error creating the index" +msgstr "internt konsistensfel när indexet skulle skapas" + +msgid "cannot create keep file" +msgstr "kan skapa ”keep”-fil" + +msgid "failed to write keep file" +msgstr "misslyckade skriva ”keep”-fil" + +msgid "cannot store pack file" +msgstr "kan inte lagra paketfil" + +msgid "cannot store index file" +msgstr "kan inte lagra indexfil" + +#, c-format +msgid "failed seeking to start of '%s'" +msgstr "misslyckades söka till början på ”%s”" + +#, c-format +msgid "core Git rejected index %s" +msgstr "kärn-Git refuserade indexet %s" + +msgid "cannot truncate pack to skip duplicate" +msgstr "kan inte trunkera paketfil för att hoppa över duplikat" + +#, c-format +msgid "EOF in data (% bytes remaining)" +msgstr "Filslut i data (% byte återstår):" + +#, c-format +msgid "unexpected deflate failure: %d" +msgstr "oväntat fel i ”deflate”: %d" + +#, c-format +msgid "not a tree: %s" +msgstr "inte ett träd: %s" + +#, c-format +msgid "can't load tree %s" +msgstr "kan inte läsa träd %s" + +#, c-format +msgid "corrupt mode in %s" +msgstr "trasigt läge i %s" + +msgid "root cannot be a non-directory" +msgstr "roten måste vara en katalog" + +msgid "empty path component found in input" +msgstr "fick tom sökvägskomponent i indata" + +msgid "non-directories cannot have subtrees" +msgstr "endast kataloger kan ha underträd" + +#, c-format +msgid "dropping %s since it would point to itself (i.e. to %s)" +msgstr "kastar %s eftersom det skulle peka på sig självt (dvs. till %s)" + +#, c-format +msgid "branch %s is missing commits." +msgstr "grenen %s saknar incheckningar." + +#, c-format +msgid "not updating %s (new tip %s does not contain %s)" +msgstr "uppdaterar inte %s (ny ändpunkt %s innehåller inte %s)" + +#, c-format +msgid "unable to create leading directories of %s" +msgstr "kan inte skapa inledande kataloger för %s" + +#, c-format +msgid "unable to write marks file %s" +msgstr "kan inte skriva märkesfilen %s" + +#, c-format +msgid "unable to write marks file %s: %s" +msgstr "kan inte skriva märkesfilen %s: %s" + +#, c-format +msgid "unable to write file %s" +msgstr "kan inte skriva filen %s" + +#, c-format +msgid "expected 'data n' command, found: %s" +msgstr "förväntade ”data n”-kommando, hittade: %s" + +#, c-format +msgid "EOF in data (terminator '%s' not found)" +msgstr "Filslut i data (avslutningsmarkören ”%s” hittades inte)" + +msgid "data is too large to use in this context" +msgstr "data är för stort för att använda i denna kontext" + +#, c-format +msgid "EOF in data (%lu bytes remaining)" +msgstr "Filslut i data (%lu byte återstår)" + +#, c-format +msgid "missing < in ident string: %s" +msgstr "saknad < i ident-sträng: %s" + +#, c-format +msgid "missing space before < in ident string: %s" +msgstr "saknat blanksteg före < i ident-sträng: %s" + +#, c-format +msgid "missing > in ident string: %s" +msgstr "saknad > i ident-sträng: %s" + +#, c-format +msgid "missing space after > in ident string: %s" +msgstr "saknat blanksteg efter > i ident-sträng: %s" + +#, c-format +msgid "invalid raw date \"%s\" in ident: %s" +msgstr "ogiltigt rått datum ”%s” i ident: %s" + +#, c-format +msgid "invalid rfc2822 date \"%s\" in ident: %s" +msgstr "ogiltigt rfc2822-datum ”%s” i ident: %s" + +#, c-format +msgid "date in ident must be 'now': %s" +msgstr "datum i ident måste vara ”nu”: %s" + +#, c-format +msgid "too large fanout (%u)" +msgstr "för stor utbredning (%u)" + +#, c-format +msgid "failed to remove path %s" +msgstr "misslyckades ta bort sökvägen %s" + +#, c-format +msgid "no value after ':' in mark: %s" +msgstr "inget värde efter ”:” i märke: %s" + +#, c-format +msgid "garbage after mark: %s" +msgstr "skräp efter märke: %s" + +#, c-format +msgid "missing space after mark: %s" +msgstr "saknat blanksteg efter märke: %s" + +#, c-format +msgid "invalid %s: %s" +msgstr "ogiltig %s: %s" + +#, c-format +msgid "NUL in %s: %s" +msgstr "NUL i %s: %s" + +#, c-format +msgid "garbage after %s: %s" +msgstr "skräp efter %s: %s" + +#, c-format +msgid "missing space after %s: %s" +msgstr "saknat blanksteg efter %s: %s" + +#, c-format +msgid "corrupt mode: %s" +msgstr "trasigt läge: %s" + +#, c-format +msgid "invalid dataref: %s" +msgstr "ogiltig datareferens: %s" + +#, c-format +msgid "missing space after SHA1: %s" +msgstr "saknat blanksteg efter SHA1: %s" + +#, c-format +msgid "Git links cannot be specified 'inline': %s" +msgstr "Git-länkar kan inte anges som ”inline”: %s" + +#, c-format +msgid "not a commit (actually a %s): %s" +msgstr "inte en incheckning (faktiskt %s): %s" + +#, c-format +msgid "directories cannot be specified 'inline': %s" +msgstr "kataloger kan inte anges som ”inline”: %s" + +#, c-format +msgid "%s not found: %s" +msgstr "hittar inte %s: %s" + +msgid "tree" +msgstr "träd" + +#, c-format +msgid "not a %s (actually a %s): %s" +msgstr "inte %s (faktiskt %s): %s" + +#, c-format +msgid "path %s not in branch" +msgstr "sökvägen %s inte på grenen" + +msgid "can't add a note on empty branch." +msgstr "kan inte lägga till en anteckning på en tom gren." + +#, c-format +msgid "mark :% not a commit" +msgstr "märket :% är inte en incheckning" + +#, c-format +msgid "not a valid commit: %s" +msgstr "inte en giltig incheckning: %s" + +#, c-format +msgid "invalid ref name or SHA1 expression: %s" +msgstr "ogiltig referensnamn eller SHA1-uttryck: %s" + +#, c-format +msgid "not a blob (actually a %s): %s" +msgstr "inte en blob (faktiskt %s): %s" + +#, c-format +msgid "blob not found: %s" +msgstr "blob:en hittades inte: %s" + +#, c-format +msgid "the commit %s is corrupt" +msgstr "incheckningen %s är trasig" + +#, c-format +msgid "can't create a branch from itself: %s" +msgstr "kan inte skapa gren från sig själv: %s" + +#, c-format +msgid "" +"expected gpgsig format: 'gpgsig ', got 'gpgsig " +"%s'" +msgstr "" +"förväntade gpgsig-format: ”gpgsig ”, fick " +"”gpgsig %s”" + +#, c-format +msgid "unknown git hash algorithm in gpgsig: '%s'" +msgstr "okänd git-hashningsalgoritm i gpgsig: ”%s”" + +#, c-format +msgid "invalid signature format in gpgsig: '%s'" +msgstr "felaktigt signaturformat i gpgsig: ”%s”" + +msgid "'unknown' signature format in gpgsig" +msgstr "”okänt” signaturformat i gpgsig" + +#, c-format +msgid "multiple %s signatures found, ignoring additional signature" +msgstr "multipla %s-signaturer hittade, ignorerar ytterligare signatur" + +msgid "parse_one_signature() returned unknown hash algo" +msgstr "parse_one_signature() returnerade okänd hashningsalgoritm" + +msgid "expected committer but didn't get one" +msgstr "förväntade incheckare men fick ingen" + +msgid "encountered signed commit; use --signed-commits= to handle it" +msgstr "" +"påträffade en signerad incheckning; använd --signed-commits= för att " +"hantera den" + +msgid "stripping a commit signature" +msgstr "tar bort en incheckningssignatur" + +msgid "importing a commit signature verbatim" +msgstr "importerar en incheckningssignatur oförändrad" + +msgid "encountered signed tag; use --signed-tags= to handle it" +msgstr "" +"upptäckte en signerad tagg; använd --signed-tags= för att hantera den" + +#, c-format +msgid "importing a tag signature verbatim for tag '%s'" +msgstr "importerar en taggsignatur oförändrad för taggen ”%s”" + +#, c-format +msgid "stripping a tag signature for tag '%s'" +msgstr "tar bort en taggsignatur för taggen ”%s”" + +#, c-format +msgid "expected 'from' command, got '%s'" +msgstr "förväntade ”from”-kommando, fick %s" + +msgid "can't tag an empty branch." +msgstr "kan inte tagga en tom gren." + +#, c-format +msgid "not a valid object: %s" +msgstr "inte ett giltigt objekt: %s" + +msgid "write to frontend failed" +msgstr "skrivning till framändan misslyckades" + +#, c-format +msgid "can't read object %s" +msgstr "kan inte läsa objektet %s" + +#, c-format +msgid "object %s is a %s but a blob was expected." +msgstr "objektet %s är en %s, men förväntade en blob." + +#, c-format +msgid "not a mark: %s" +msgstr "inte ett märke: %s" + +#, c-format +msgid "unknown mark: %s" +msgstr "okänt märke: %s" + +#, c-format +msgid "garbage after SHA1: %s" +msgstr "skräp efter SHA1: %s" + +#, c-format +msgid "not a tree-ish: %s" +msgstr "inte ett träd-igt: %s" + +#, c-format +msgid "can't load object %s" +msgstr "kan inte läsa in objektet %s" + +#, c-format +msgid "invalid SHA1 in tag: %s" +msgstr "ogiltigt SHA1 i tagg: %s" + +#, c-format +msgid "invalid SHA1 in commit: %s" +msgstr "ogiltigt SHA1 i incheckning: %s" + +#, c-format +msgid "missing from marks for submodule '%s'" +msgstr "saknade från-märken i undermodulen ”%s”" + +#, c-format +msgid "missing to marks for submodule '%s'" +msgstr "saknade till-märken i undermodulen ”%s”" #, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "Saknar till-märken för undermodulen ”%s”" +msgid "missing space after tree-ish: %s" +msgstr "saknat blanksteg efter träd-igt: %s" #, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Förväntade ”mark”-kommando, fick %s" +msgid "not in a commit: %s" +msgstr "inte en incheckning: %s" #, c-format -msgid "Expected 'to' command, got %s" -msgstr "Förväntade ”to”-kommando, fick %s" +msgid "expected 'mark' command, got %s" +msgstr "förväntade ”mark”-kommando, fick %s" -msgid "Expected format name:filename for submodule rewrite option" -msgstr "Förväntade formatet namn:filnamn för undermodul-omskrivningsflaggan" +#, c-format +msgid "expected 'to' command, got %s" +msgstr "förväntade ”to”-kommando, fick %s" + +msgid "only one import-marks command allowed per stream" +msgstr "endast ett import-marks-kommando tillåts per ström" + +#, c-format +msgid "unknown --date-format argument %s" +msgstr "okänt argument till --date-format: %s" + +#, c-format +msgid "%s: argument must be a non-negative integer" +msgstr "%s: argumentet måste vara ett icke-negativt heltal" + +#, c-format +msgid "--depth cannot exceed %u" +msgstr "--depth kan inte överstiga %u" + +#, c-format +msgid "--cat-blob-fd cannot exceed %d" +msgstr "--cat-blob-fd kan inte överstiga %d" + +msgid "expected format name:filename for submodule rewrite option" +msgstr "förväntade formatet namn:filnamn för undermodul-omskrivningsflaggan" + +#, c-format +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum" +msgstr "max-pack-size är nu i byte, antar --max-pack-size=%lum" + +msgid "minimum max-pack-size is 1 MiB" +msgstr "minsta max-pack-size är 1 MiB" + +#, c-format +msgid "unknown --signed-commits mode '%s'" +msgstr "okänt läge ”%s” för --signed-commits" + +#, c-format +msgid "unknown --signed-tags mode '%s'" +msgstr "okänt läge ”%s” för --signed-tags" #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "funktionen ”%s” förbjuden i indata utan --allow-unsafe-features" +#, c-format +msgid "got feature command '%s' after data command" +msgstr "fick funktionskommando ”%s” efter datakommando" + +#, c-format +msgid "this version of fast-import does not support feature %s." +msgstr "den här versionen av fast-import stöder inte funktionen %s." + +#, c-format +msgid "got option command '%s' after data command" +msgstr "fick tillvalskommando ”%s” efter datakommando" + +#, c-format +msgid "this version of fast-import does not support option: %s" +msgstr "den här versionen av fast-import stöder inte tillvalet: %s" + +#, c-format +msgid "unknown option %s" +msgstr "okänd flagga %s" + +#, c-format +msgid "unknown option --%s" +msgstr "okänd flagga --%s" + +#, c-format +msgid "unsupported command: %s" +msgstr "kommando stöds ej: %s" + +msgid "stream ends early" +msgstr "strömmen slutade för tidigt" + #, c-format msgid "Lockfile created but not reported: %s" msgstr "Låsfil skapad men inte rapporterad: %s" @@ -5993,6 +6569,35 @@ msgstr "" "varningen till fjärren ändrar HEAD till något annat genom att köra\n" "”git config set remote %s.followRemoteHEAD warn-if-not-branch-%s”." +msgid "" +"You're on a case-insensitive filesystem, and the remote you are\n" +"trying to fetch from has references that only differ in casing. It\n" +"is impossible to store such references with the 'files' backend. You\n" +"can either accept this as-is, in which case you won't be able to\n" +"store all remote references on disk. Or you can alternatively\n" +"migrate your repository to use the 'reftable' backend with the\n" +"following command:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Please keep in mind that not all implementations of Git support this\n" +"new format yet. So if you use tools other than Git to access this\n" +"repository it may not be an option to migrate to reftables.\n" +msgstr "" +"Du är på ett skiftlägesokänsligt filsystem och fjärren du försöker\n" +"hämta från har referenser vars namn bara varierar i små och stora\n" +"bokstäver. Det är inte möjligt att spara sådana referenser med\n" +"”files”-bakändan. Du kan antingen godta det som det är, i vilket\n" +"fall du inte kommer kunna lagra alla fjärr-referenser på disken.\n" +"Eller så kan du migrera ditt arkiv till att använda bakändan\n" +"”reftable” med hjälp av följande kommando:\n" +"\n" +" git refs migrate --ref-format=reftable\n" +"\n" +"Tänk på att alla implementationer av Git ännu inte stöder detta\n" +"format. Så om du använder andra verktyg än Git för att läsa detta\n" +"arkiv är migrering till referenstabeller kanske inte ett alternativ.\n" + #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6196,11 +6801,11 @@ msgid "protocol does not support --negotiate-only, exiting" msgstr "protokollet stöder inte --negotiate-only, avslutar" msgid "" -"--filter can only be used with the remote configured in extensions." -"partialclone" +"--filter can only be used with the remote configured in " +"extensions.partialclone" msgstr "" -"--filter kan endast användas med fjärren konfigurerad i extensions." -"partialclone" +"--filter kan endast användas med fjärren konfigurerad i " +"extensions.partialclone" msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic kan bara användas vid hämtning från en fjärr" @@ -6231,23 +6836,6 @@ msgstr "använd istället för den verkliga målgrenen" msgid "file to read from" msgstr "fil att läsa från" -msgid "git for-each-ref [] []" -msgstr "git for-each-ref [] []" - -msgid "git for-each-ref [--points-at ]" -msgstr "git for-each-ref [--points-at ]" - -msgid "git for-each-ref [--merged []] [--no-merged []]" -msgstr "" -"git for-each-ref [--merged []] [--no-merged ]]" - -msgid "git for-each-ref [--contains []] [--no-contains []]" -msgstr "" -"git for-each-ref [--contains []] [--no-contains []]" - -msgid "git for-each-ref [--start-after ]" -msgstr "git for-each-ref [--start-after ]" - msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" @@ -6302,6 +6890,9 @@ msgstr "okända argument angavs tillsammans med --stdin" msgid "cannot use --start-after with patterns" msgstr "kan inte använda --start-after med mönster" +msgid "git for-each-ref " +msgstr "git for-each-ref " + msgid "git for-each-repo --config= [--] " msgstr "git for-each-repo --config= [--] " @@ -6777,6 +7368,9 @@ msgstr "" "hoppar över ”incremental-repack”-uppgift eftersom core.multiPackIndex är " "inaktiverat" +msgid "failed to perform geometric repack" +msgstr "misslyckades att utföra geometrisk ompackning" + #, c-format msgid "task '%s' failed" msgstr "uppgiften ”%s” misslyckades" @@ -6785,6 +7379,10 @@ msgstr "uppgiften ”%s” misslyckades" msgid "lock file '%s' exists, skipping maintenance" msgstr "låsfilen ”%s” finns, hoppar över underhåll" +#, c-format +msgid "unknown maintenance strategy: '%s'" +msgstr "okänd underhållsstrategi: ”%s”" + #, c-format msgid "'%s' is not a valid task" msgstr "”%s” är inte en giltig uppgift" @@ -7644,6 +8242,29 @@ msgstr "--trailer med --only-input ger ingen mening" msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering på plats" +msgid "last-modified can only operate on one tree at a time" +msgstr "last-modified kan bara användas på ett träd åt gången" + +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "okänt argument till last-modified: %s" + +msgid "unable to setup last-modified" +msgstr "kan inte ställa in last-modified" + +msgid "" +"git last-modified [--recursive] [--show-trees] [] [[--] " +"...]" +msgstr "" +"git last-modified [--recursive] [--show-trees] [] [[--] " +"...]" + +msgid "recurse into subtrees" +msgstr "rekursera ner i underträd" + +msgid "show tree entries when recursing into subtrees" +msgstr "visa trädposter under rekursering in i underträd" + msgid "git log [] [] [[--] ...]" msgstr "git log [] [] [[--] ...]" @@ -7682,6 +8303,20 @@ msgstr "" msgid "-L: cannot be used with pathspec" msgstr "-L: kan inte användas med sökvägsspecifikation" +msgid "" +"\n" +"hint: You can replace 'git whatchanged ' with:\n" +"hint:\tgit log --raw --no-merges\n" +"hint: Or make an alias:\n" +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"\n" +msgstr "" +"\n" +"tips: du kan ersätta ”git whatchanged ” med:\n" +"tips:\tgit log --raw --no-merges\n" +"tips: Eller skapa ett alias:\n" +"tips:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" + #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" @@ -8112,11 +8747,8 @@ msgstr "git ls-tree [] [...]" msgid "only show trees" msgstr "visa endast träd" -msgid "recurse into subtrees" -msgstr "rekursera ner i underträd" - msgid "show trees when recursing" -msgstr "visa träd medan rekursering" +msgstr "visa träd under rekursering" msgid "terminate entries with NUL byte" msgstr "terminera poster med NUL-byte" @@ -8260,10 +8892,6 @@ msgstr "objektet ”%s” finns inte" msgid "Could not write object file" msgstr "Kunde inte skriva objektfilen" -#, c-format -msgid "unknown option %s" -msgstr "okänd flagga %s" - #, c-format msgid "could not parse object '%s'" msgstr "kunde inte tolka objektet ”%s”" @@ -8431,10 +9059,6 @@ msgstr "kunde köra stash." msgid "stash failed" msgstr "stash misslyckades" -#, c-format -msgid "not a valid object: %s" -msgstr "inte ett giltigt objekt: %s" - msgid "read-tree failed" msgstr "read-tree misslyckades" @@ -9569,27 +10193,8 @@ msgstr "" "Totalt % (delta %), återanvände % (delta %), " "paket-återanvända % (från %)" -msgid "" -"git pack-refs [--all] [--no-prune] [--auto] [--include ] [--exclude " -"]" -msgstr "" -"git pack-refs [--all] [--no-prune] [--auto] [--include ] [--exclude " -"]" - -msgid "pack everything" -msgstr "packa allt" - -msgid "prune loose refs (default)" -msgstr "ta bort lösa referenser (standard)" - -msgid "auto-pack refs as needed" -msgstr "packa referenser automatiskt om nödvändigt" - -msgid "references to include" -msgstr "referenser att ta med" - -msgid "references to exclude" -msgstr "referenser att utesluta" +msgid "git pack-refs " +msgstr "git pack-refs " msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -9831,8 +10436,8 @@ msgid "" msgstr "" "\n" "För att undvika att en uppströmsgren automatiskt konfigureras när dess namn\n" -"inte motsvarar den lokala grenen, se värdet ”simple” i branch." -"autoSetupMerge\n" +"inte motsvarar den lokala grenen, se värdet ”simple” i " +"branch.autoSetupMerge\n" "i ”git help config”.\n" #, c-format @@ -10095,6 +10700,10 @@ msgstr "git range-diff [] .." msgid "git range-diff [] " msgstr "git range-diff [] " +#, c-format +msgid "invalid max-memory value: %s" +msgstr "felaktigt värde för max-memory: %s" + msgid "use simple diff colors" msgstr "använd enkla diff-färger" @@ -10104,6 +10713,12 @@ msgstr "anteckningar" msgid "passed to 'git log'" msgstr "sänds till ”git log”" +msgid "size" +msgstr "storlek" + +msgid "maximum memory for cost matrix (default 4G)" +msgstr "maximalt minne för kostnadsmatris (förval 4G)" + msgid "only emit output related to the first range" msgstr "visa endast utdata för det första intervallet" @@ -10653,16 +11268,11 @@ msgstr "git reflog [show] [] []" msgid "git reflog list" msgstr "git reflog list" -msgid "" -"git reflog expire [--expire=