tvl-depot/third_party/git/po/ca.po

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

23870 lines
667 KiB
Text
Raw Normal View History

# Catalan translations for Git.
# This file is distributed under the same license as the Git package.
# Alex Henrie <alexhenrie24@gmail.com>, 2014-2016.
# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2019
#
# Terminologia i criteris utilitzats
#
# Anglès | Català
# -----------------+---------------------------------
# ahead | davant per
# amend | esmenar
# bundle | farcell
# broken | malmès
# delta | diferència
# deprecated | en desús
# dry | simulació
# fatal | fatal
# hook | lligam
# hunk | tros
# not supported | no està admès
# repository | dipòsit
# setting | paràmetre
# skip | ometre
# squelch | silenciar
# token | testimoni
# unset | desassignar
# upstream | font
#
# Alguns termes que són ordres específiques del git i d'àmbit molt tècnic
# hem decidit no traduir-los per facilitar-ne la compressió a l'usuari i perquè
# no tenen una transcendència al gran públic. Es tracta de casos similars
# a «ping» en l'àmbit de xarxes.
#
# Termes que mantenim en anglès:
#
#
# Anglès | Català
# -----------------+---------------------------------
# blame | «blame»
# HEAD | HEAD (f, la branca)
# cherry pick | «cherry pick»
# rebase | «rebase»
# stage | «stage»
# stash | «stash»
# squash | «squash»
# trailer | «trailer»
# unstage | «unstage»
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2019-07-30 09:59+0800\n"
"PO-Revision-Date: 2019-07-30 08:23+0200\n"
"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.2.1\n"
#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%spista: %.*s%s\n"
#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar."
#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "No és possible %s perquè teniu fitxers sense fusionar."
#: advice.c:180
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
"Arregleu-los en l'arbre de treball, i després useu\n"
"'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
"resolució i feu una comissió."
#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "S'està sortint a causa d'un conflicte no resolt."
#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Cometeu els vostres canvis abans de fusionar."
#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "S'està sortint a causa d'una fusió no terminada."
#: advice.c:202
#, fuzzy, c-format
msgid ""
"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
" git switch -c <new-branch-name>\n"
"\n"
"Or undo this operation with:\n"
"\n"
" git switch -\n"
"\n"
"Turn off this advice by setting config variable advice.detachedHead to "
"false\n"
"\n"
msgstr ""
"Avís: s'està agafant «%s».\n"
"\n"
"Esteu en un estat de «HEAD separat». Podeu mirar al voltant, fer canvis\n"
"experimentals i cometre'ls, i podeu descartar qualsevol comissió que feu\n"
"en aquest estat sense cap branca realitzant un altre agafament.\n"
"\n"
"Si voleu crear una branca nova per a conservar les comissions que creeu,\n"
"poder fer-ho (ara o més tard) usant -b de nou amb l'ordre checkout.\n"
"Exemple:\n"
"\n"
" git checkout -b <nom-de-branca-nova>\n"
#: alias.c:50
msgid "cmdline ends with \\"
msgstr "la línia d'ordres acaba amb \\"
#: alias.c:51
msgid "unclosed quote"
msgstr ""
#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opció d'espai en blanc «%s» no reconeguda"
#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opció ignora l'espai en blanc «%s» no reconeguda"
#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject i --3way no es poden usar junts."
#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached i --3way no es poden usar junts."
#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way fora d'un dipòsit"
#: apply.c:151
msgid "--index outside a repository"
msgstr "--index fora d'un dipòsit"
#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached fora d'un dipòsit"
#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No es pot preparar l'expressió regular de marca de temps %s"
#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec ha retornat %d per l'entrada: %s"
#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la "
"línia %d"
#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia "
"%d"
#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la "
"línia %d"
#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff incorrecte - s'esperava /dev/null en la línia %d"
#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "mode no vàlid en la línia %d: %s"
#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "línies de capçalera %d i %d inconsistents"
#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recompte: línia inesperada: %.*s"
#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"component (line %d)"
msgid_plural ""
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] ""
"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
"%d component de nom de camí inicial (línia %d)"
msgstr[1] ""
"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
"%d components de nom de camí inicial (línia %d)"
#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"a la capçalera de git diff li manca informació de nom de fitxer (línia %d)"
#: apply.c:1752
msgid "new file depends on old contents"
msgstr "el fitxer nou depèn dels continguts antics"
#: apply.c:1754
msgid "deleted file still has contents"
msgstr "el fitxer suprimit encara té continguts"
#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "pedaç malmès a la línia %d"
#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "el fitxer nou %s depèn dels continguts antics"
#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "el fitxer suprimit %s encara té continguts"
#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "no s'ha pogut obrir o llegir %s"
#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inici de línia no vàlid: «%c»"
#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d línia)."
msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)."
#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
"tot cercant:\n"
"%.*s"
#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "manquen les dades de pedaç binari de «%s»"
#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»"
#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
"actuals."
#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "el pedaç s'aplica a un «%s» buit però no és buit"
#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "no es pot llegir la postimatge %s necessària per a «%s»"
#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el pedaç binari no s'aplica a «%s»"
#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha "
"rebut %s)"
#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "s'ha produït un error en llegir %s"
#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies."
#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "S'està retrocedint a una fusió de 3 vies...\n"
#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "no es poden llegir els continguts actuals de «%s»"
#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n"
#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "camí no vàlid: «%s»"
#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic"
#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "S'està comprovant el pedaç %s..."
#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "falta la informació sha1 o és inútil per al submòdul %s"
#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "canvi de mode per a %s, el qual no està en la HEAD actual"
#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informació sha1 o és inútil (%s)."
#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry ha fallat per al camí «%s»"
#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "no s'ha pogut afegir %s a l'índex temporal"
#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "no s'ha pogut escriure l'índex temporal a %s"
#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
"%s"
#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no s'ha pogut afegir una entrada de cau per a %s"
#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "s'està tancant el fitxer «%s»"
#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
#: apply.c:4526
msgid "internal error"
msgstr "error intern"
#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..."
msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..."
#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161
#, c-format
msgid "cannot open %s"
msgstr "no es pot obrir %s"
#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "S'ha omès el pedaç «%s»."
#: apply.c:4684
msgid "unrecognized input"
msgstr "entrada no reconeguda"
#: apply.c:4704
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no es pot obrir el pedaç «%s»: %s"
#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "s'ha silenciat %d error d'espai en blanc"
msgstr[1] "s'han silenciat %d errors d'espai en blanc"
#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línia afegeix errors d'espai en blanc."
msgstr[1] "%d línies afegeixen errors d'espai en blanc."
#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
"S'ha aplicat %d línia després d'arreglar els errors d'espai en blanc."
msgstr[1] ""
"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "No s'ha pogut escriure un fitxer d'índex nou"
#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
#: builtin/pull.c:208 builtin/submodule--helper.c:407
#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "camí"
#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "número"
#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
#: builtin/pack-objects.c:3319 builtin/rebase.c:1421
msgid "action"
msgstr "acció"
#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "sigues detallat"
#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "arrel"
#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<opcions>] <arbre> [<camí>...]"
#: archive.c:15
msgid "git archive --list"
msgstr "git archive --list"
#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
"[<camí>...]"
#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
#: archive.c:396
#, c-format
msgid "no such ref: %.*s"
msgstr "no existeix la referència: %.*s"
#: archive.c:401
#, c-format
msgid "not a valid object name: %s"
msgstr "no és un nom d'objecte vàlid: %s"
#: archive.c:414
#, c-format
msgid "not a tree object: %s"
msgstr "no és un objecte d'arbre: %s"
#: archive.c:426
msgid "current working directory is untracked"
msgstr "no es segueix el directori de treball actual"
#: archive.c:457
msgid "fmt"
msgstr "format"
#: archive.c:457
msgid "archive format"
msgstr "format d'arxiu"
#: archive.c:458 builtin/log.c:1597
msgid "prefix"
msgstr "prefix"
#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "fitxer"
#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
#: archive.c:464
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
#: archive.c:465
msgid "store only"
msgstr "només emmagatzema"
#: archive.c:466
msgid "compress faster"
msgstr "comprimeix més ràpidament"
#: archive.c:474
msgid "compress better"
msgstr "comprimeix millor"
#: archive.c:477
msgid "list supported archive formats"
msgstr "llista els formats d'arxiu admesos"
#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "dipòsit"
#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr "ordre"
#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "camí a l'ordre git-upload-archive remota"
#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Opció inesperada --remote"
#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "L'opció --exec només es pot usar juntament amb --remote"
#: archive.c:493
msgid "Unexpected option --output"
msgstr "Opció inesperada --output"
#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'arxiu desconegut «%s»"
#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Paràmetre no admès per al format «%s»: -%d"
#: archive-tar.c:125 archive-zip.c:345
#, fuzzy, c-format
msgid "cannot stream blob %s"
msgstr "no es pot emmagatzemar %s"
#: archive-tar.c:260 archive-zip.c:363
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)"
#: archive-tar.c:287 archive-zip.c:353
#, c-format
msgid "cannot read %s"
msgstr "no es pot llegir «%s»"
#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "no s'ha pogut iniciar el filtre «%s»"
#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "no s'ha pogut redirigir el descriptor"
#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "«%s» error reportat pel filtre"
#: archive-zip.c:314
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "el camí no és vàlid en UTF-8: %s"
#: archive-zip.c:318
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s"
#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
#, c-format
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
#: archive-zip.c:609
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>"
#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s no és un nom d'atribut vàlid"
#: attr.c:368
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s no està permès: %s:%d"
#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
"Els patrons negatius s'ignoren en els atributs de git\n"
"Useu '\\!' per exclamació capdavantera literal."
#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s"
#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "No podem bisecar més!\n"
#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "No és un nom de comissió vàlid %s"
#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
"La base de fusió %s és errònia.\n"
"Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n"
#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
"La base de fusió %s és nova.\n"
"La propietat s'ha canviat entre %s i [%s].\n"
#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
"La base de fusió %s és %s.\n"
"Això vol dir que la primera comissió «%s» és entre %s i [%s].\n"
#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"git bisect cannot work properly in this case.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
"Algunes revisions %s no són els avantpassats de la revisió %s.\n"
"git bisect no pot funcionar correctament en aquest cas.\n"
"Potser heu confós les revisions %s i %s?\n"
#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"So we cannot be sure the first %s commit is between %s and %s.\n"
"We continue anyway."
msgstr ""
"s'ha d'ometre la base de fusió entre %s i [%s].\n"
"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i "
"%s.\n"
"Continuem de totes maneres."
#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecant: s'ha de provar una base de fusió\n"
#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "es necessita una revisió %s"
#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "no s'ha pogut crear el fitxer «%s»"
#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "no s'ha pogut llegir el fitxer «%s»"
#: bisect.c:958
msgid "reading bisect refs failed"
msgstr "la lectura de les referències de bisecció ha fallat"
#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era ambdós %s i %s\n"
#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
"No s'ha trobat cap comissió comprovable.\n"
"Potser heu començat amb paràmetres de camí incorrectes?\n"
#: bisect.c:1004
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
msgstr[0] "(aproximadament %d pas)"
msgstr[1] "(aproximadament %d passos)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
#: bisect.c:1010
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n"
msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n"
#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents i --reverse no funcionen bé juntes."
#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse i --first-parent-together requereixen una última comissió "
"especificada"
#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980
#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent junts requereixen un rang de la cadena de mares "
"primeres"
#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "no hi ha tal camí %s en %s"
#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "no es pot llegir el blob %s per al camí %s"
#: branch.c:53
#, c-format
msgid ""
"\n"
"After fixing the error cause you may try to fix up\n"
"the remote tracking information by invoking\n"
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
"\n"
"Després de corregir la causa de l'error, podeu\n"
"intentar corregir la informació de seguiment remot\n"
"invocant \"git branch --set-upstream-to=%s%s%s\"."
#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "No s'està establint la branca %s com a la seva pròpia font."
#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s» "
"fent «rebase»."
#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
"La branca «%s» està configurada per a seguir la branca local «%s» fent "
"«rebase»."
#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "La branca «%s» està configurada per a seguir la branca local «%s»."
#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
"La branca «%s» està configurada per a seguir la referència remota «%s» fent "
"«rebase»."
#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
"La branca «%s» està configurada per a seguir la referència remota «%s»."
#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
"La branca «%s» està configurada per a seguir la referència local «%s» fent "
"«rebase»."
#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "La branca «%s» està configurada per a seguir la referència local «%s»."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "No es pot escriure la configuració de la branca font"
#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "No seguint: informació ambigua per a la referència %s"
#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "«%s» no és un nom de branca vàlid."
#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Una branca amb nom «%s» ja existeix."
#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "No es pot actualitzar la branca actual a la força."
#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"No es pot configurar la informació de seguiment; el punt inicial «%s» no és "
"una branca."
#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branca font demanada «%s» no existeix"
#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"branch that already exists at the remote, you may need to\n"
"run \"git fetch\" to retrieve it.\n"
"\n"
"If you are planning to push out a new local branch that\n"
"will track its remote counterpart, you may want to use\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
"Si teniu pensat basar el vostre treball en una branca\n"
"font que ja existeix al remot, pot ser que necessiteu\n"
"executar «git fetch» per a obtenir-la.\n"
"\n"
"Si teniu pensat pujar una branca local nova que seguirà\n"
"la seva contrapart remota, pot ser que vulgueu usar\n"
"«git push -u» per a establir la configuració font\n"
"mentre pugeu."
#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "No és un nom d'objecte vàlid: «%s»."
#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objecte ambigu: «%s»."
#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "No és un punt de ramificació vàlid: «%s»."
#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» ja s'ha agafat a «%s»"
#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD de l'arbre de treball %s no està actualitzat"
#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr "«%s» no sembla un fitxer de farcell v2"
#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir «%s»"
#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
#: bundle.c:146
msgid "need a repository to verify a bundle"
msgstr "cal un dipòsit per verificar un farcell"
#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "El farcell conté aquesta referència:"
msgstr[1] "El farcell conté aquestes %d referències:"
#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "El farcell registra una història completa."
#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "El farcell requereix aquesta referència:"
msgstr[1] "El farcell requereix aquestes %d referències:"
#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "no s'ha pogut duplicar el descriptor del farcell"
#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "No s'ha pogut executar el pack-objects"
#: bundle.c:290
msgid "pack-objects died"
msgstr "El pack-objects s'ha mort"
#: bundle.c:332
msgid "rev-list died"
msgstr "El rev-list s'ha mort"
#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "les opcions de la llista de revisions exclouen la referència «%s»"
#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "S'està refusant crear un farcell buit."
#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "no es pot crear «%s»"
#: bundle.c:503
msgid "index-pack died"
msgstr "L'index-pack s'ha mort"
#: color.c:296
#, c-format
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s no és una comissió!"
#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\n"
"Please use \"git replace --convert-graft-file\"\n"
"to convert the grafts into replace refs.\n"
"\n"
"Turn this message off by running\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s."
#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s."
#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té signatura GPG."
#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La comissió %s té una signatura GPG bona de %s\n"
#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
"Advertència: el missatge de comissió no és compatible amb UTF-8.\n"
"Potser voleu esmenar-lo després de corregir el missatge, o establir\n"
"la variable de configuració i18n.commitencoding a la codificació que\n"
"usi el vostre projecte.\n"
#: commit-graph.c:127
msgid "commit-graph file is too small"
msgstr ""
#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "la signatura del graf de comissions %X no coincideix amb la signatura %X"
#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "la versió del graf de comissions %X no coincideix amb la versió %X"
#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "la versió del hash del graf de comissions %X no coincideix amb la versió %X"
#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr ""
#: commit-graph.c:347
msgid "commit-graph has no base graphs chunk"
msgstr ""
#: commit-graph.c:357
msgid "commit-graph chain does not match"
msgstr "la cadena del graf de comissions no coincideix"
#: commit-graph.c:404
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr ""
#: commit-graph.c:430
msgid "unable to find all commit-graph files"
msgstr "no es poden trobar tots els fitxers del graf de comissions"
#: commit-graph.c:553 commit-graph.c:613
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "posició de la comissió no vàlida. Probablement el graf de comissions està malmès"
#: commit-graph.c:574
#, c-format
msgid "could not find commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
#: commit-graph.c:1001 builtin/pack-objects.c:2651
#, c-format
msgid "unable to get type of object %s"
msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
#: commit-graph.c:1033
msgid "Loading known commits in commit graph"
msgstr "S'estan carregant comissions conegudes al graf de comissions"
#: commit-graph.c:1050
msgid "Expanding reachable commits in commit graph"
msgstr "S'estan expandint les comissions abastables al graf de comissions"
#: commit-graph.c:1069
msgid "Clearing commit marks in commit graph"
msgstr "S'estan netejant les marques de comissions al graf de comissions"
#: commit-graph.c:1088
msgid "Computing commit graph generation numbers"
msgstr "S'estan calculant els nombres de generació del graf de comissions"
#: commit-graph.c:1162
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet"
msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets"
#: commit-graph.c:1175
#, c-format
msgid "error adding pack %s"
msgstr "error en afegir paquet %s"
#: commit-graph.c:1179
#, c-format
msgid "error opening index for %s"
msgstr "s'ha produït un error en obrir l'índex per «%s»"
#: commit-graph.c:1203
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "S'estan cercant les comissions pel graf de comissions des de %d referència"
msgstr[1] "S'estan cercant les comissions pel graf de comissions des de %d referències"
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96 af6b65d45e Git 2.26.2 7397ca3373 Git 2.25.4 b86a4be245 Git 2.24.3 f2771efd07 Git 2.23.3 c9808fa014 Git 2.22.4 9206d27eb5 Git 2.21.3 041bc65923 Git 2.20.4 76b54ee9b9 Git 2.19.5 ba6f0905fd Git 2.18.4 df5be6dc3f Git 2.17.5 1a3609e402 fsck: reject URL with empty host in .gitmodules e7fab62b73 credential: treat URL with empty scheme as invalid c44088ecc4 credential: treat URL without scheme as invalid fe29a9b7b0 credential: die() when parsing invalid urls a2b26ffb1a fsck: convert gitmodules url to URL passed to curl 8ba8ed568e credential: refuse to operate when missing host or protocol 24036686c4 credential: parse URL without host as empty host, not unset 73aafe9bc2 t0300: use more realistic inputs a88dbd2f8c t0300: make "quit" helper more realistic de49261b05 Git 2.26.1 274b9cc253 Git 2.26 55a7568606 Merge branch 'en/rebase-backend' c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git 1557364fb4 l10n: tr.po: change file mode to 644 2da1b05674 t3419: prevent failure when run with EXPENSIVE 1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0 5804c6ec40 l10n: de.po: add missing space 98cedd0233 Merge https://github.com/prati0100/git-gui 4914ba4bcf l10n: tr: Fix a couple of ambiguities a5728022e0 Merge branch 'py/remove-tcloo' 7fcb965970 RelNotes/2.26.0: fix various typos f0c03bcf95 l10n: Update Catalan translation 67b0a24910 Git 2.25.3 be8661a328 Sync with Git 2.25.2 0822e66b5d Git 2.25.2 65588b0b2e unicode: update the width tables to Unicode 13.0 7be274b0ff Merge branch 'js/ci-windows-update' into maint 9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint 221887a492 Merge branch 'jk/doc-credential-helper' into maint 32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint 618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint 50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint 41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint 2d7247af6f Merge branch 'am/mingw-poll-fix' into maint 4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint 76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint 569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint 16a4bf1035 Merge branch 'en/check-ignore' into maint 3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint 56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint 1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint 7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint 93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint 758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint 506223f9c5 Git 2.24.2 17a02783d8 Git 2.23.2 69fab82147 Git 2.22.3 fe22686494 Git 2.21.2 d1259ce117 Git 2.20.3 a5979d7009 Git 2.19.4 21a3e5016b Git 2.18.3 c42c0f1297 Git 2.17.4 d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u) 3891a84ccd git-gui: create a new namespace for chord script evaluation 8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5 440e7442d1 l10n: zh_CN: Revise v2.26.0 translation 2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 6c85aac65f Git 2.26-rc2 74f172e39e Merge branch 'en/test-cleanup' e96327c947 Merge branch 'es/outside-repo-errmsg-hints' ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 15fa8d9667 l10n: vi: fix translation + grammar 5c20398699 prefix_path: show gitdir if worktree unavailable 1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) a4a2f64642 Merge branch 'js/askpass-coerce-utf8' 850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows d769dcc5cd Merge branch 'py/blame-status-error' 70e24186c0 t6022, t6046: fix flaky files-are-updated checks 30e9940356 Hopefully the final batch before -rc2 b4f0038525 Merge branch 'en/rebase-backend' 25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master 07259e74ec fsck: detect gitmodules URLs with embedded newlines c716fe4bd9 credential: detect unrepresentable values when parsing urls 17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr 9a6bbee800 credential: avoid writing values with newlines 17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2 1afe18a3bb l10n: es: 2.26.0 round#2 5ab9217a3c Merge branch of github.com:alshopov/git-po into master c6713676d6 Merge branch of github.com:bitigchi/git-po into master b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t) 2713dec02d l10n: tr: v2.26.0 round 2 c9ef57cc3a l10n: fr : v2.26.0 rnd 2 120b1eb731 git-rebase.txt: highlight backend differences with commit rewording 9a1b7474d6 sequencer: clear state upon dropping a become-empty commit 937d143630 i18n: unmark a message in rebase.c a56d361f66 Merge branch 'ds/sparse-add' 5fa9169ced Merge branch 'dr/push-remote-ref-update' cdef998b46 Merge branch 'jc/doc-single-h-is-for-help' 051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) 52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master 9643441983 l10n: tr: Add glossary for Turkish translations 438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git 2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u) dd2c269652 l10n: tr: Add Turkish translations 8f4f099f8b l10n: tr: Add Turkish translation team info b4374e96c8 Git 2.26-rc1 4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch' 3658d77f8e Merge branch 'hd/show-one-mergetag-fix' 6125104b88 Merge branch 'rt/format-zero-length-fix' 1ac37deba2 Merge branch 'am/mingw-poll-fix' cf372dc815 Merge branch 'en/test-cleanup' d1075adfdf Merge branch 'en/merge-path-collision' a4fd114ffc Merge branch 'kk/complete-diff-color-moved' a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file' 0e0d717537 Merge branch 'pb/am-show-current-patch' 9b7f726dfc Merge branch 'am/pathspec-f-f-more' 4605a73073 t1091: don't grep for `strerror()` string 4d9c2902a1 l10n: fr v2.26.0 rnd1 ad182bee3f Merge branch of github.com:alshopov/git-po into master 23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1 98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t) f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed) 76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po 076cbdcd73 Git 2.26-rc0 0d65f3fb1a t5537: adjust test_oid label e63cefb024 Merge branch 'hi/gpg-use-check-signature' 5da7329e29 Merge branch 'rs/commit-graph-code-simplification' 0108fc1b46 Merge branch 'js/ci-windows-update' f3ccd9f0d9 Merge branch 'be/describe-multiroot' a6b4709302 Merge branch 'ag/rebase-remove-redundant-code' b22db265d6 Merge branch 'es/recursive-single-branch-clone' e8e71848ea Merge branch 'jk/nth-packed-object-id' a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch' 4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere' 49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix' 2cbb058669 Merge branch 'bc/wildcard-credential' 25063e2530 Merge branch 'mr/bisect-in-c-1' f4d7dfce4d Merge branch 'ds/sparse-add' 4d864895a2 t2402: test worktree path when called in .git directory af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch() 7655b4119d remote-curl: show progress for fetches over dumb HTTP 2f268890c2 The eighth batch for 2.26 aa5a7e02ad Merge branch 'ma/test-cleanup' 58595e713c Merge branch 'rs/blame-typefix-for-fingerprint' ff41848e99 Merge branch 'rs/micro-cleanups' 4cbf1a0e22 Merge branch 'es/worktree-cleanup' 46703057c1 Merge branch 'ak/test-log-graph' 777815f5f9 Merge branch 'jk/run-command-formatfix' 444cff61b4 Merge branch 'ds/partial-clone-fixes' 48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure' 8c22bd9ff9 Merge branch 'en/rebase-backend' cb2f5a8e97 Merge branch 'en/check-ignore' 0df82d99da Merge branch 'jk/object-filter-with-bitmap' 80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix' 29b09c518c Merge branch 'jk/doc-diff-parallel' 237a28173f show_one_mergetag: print non-parent in hex form. 5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context" 6d1210e133 l10n: Update Catalan translation 0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification" 7329d94be7 config.mak.dev: re-enable -Wformat-zero-length 7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings 94f4d01932 mingw: workaround for hangs when sending STDIN 1ff466c018 Documentation: clarify that `-h` alone stands for `help` 65bf820d0e t6020: new test with interleaved lexicographic ordering of directories 9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it d5bb92eced t3035: prefer test_must_fail to bash negation for git commands b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions 42d180dd01 t602[1236], t6034: modernize test formatting 802050400a merge-recursive: apply collision handling unification to recursive case 7f487ce062 Azure Pipeline: switch to the latest agent pools 5ed9fc3fc8 ci: prevent `perforce` from being quarantined eafff6e41e t/lib-httpd: avoid using macOS' sed d68ce906c7 commit-graph: use progress title directly 30b1c7ad9d describe: don't abort too early when searching tags 240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to' 2d2118b814 The seventh batch for 2.26 325eb66830 Merge branch 'es/doc-mentoring' 87f17d790d Merge branch 'es/bright-colors' d0038f4b31 Merge branch 'bw/remote-rename-update-config' 132f600b06 clone: pass --single-branch during --recurse-submodules 47319576f1 submodule--helper: use C99 named initializer ffe005576a lib-log-graph: consolidate colored graph cmp logic 989eea958b lib-log-graph: consolidate test_cmp_graph logic bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching bb4995fc3f worktree: add utility to find worktree by pathname a80c4c2214 worktree: improve find_worktree() documentation 2fecc48cad packfile: drop nth_packed_object_sha1() 6ac9760a30 packed_object_info(): use object_id internally for delta base b99b6bcc57 packed_object_info(): use object_id for returning delta base 63f4a7fc01 pack-check: push oid lookup into loop e31c71083a pack-check: convert "internal error" die to a BUG() 500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps f66d4e0250 pack-objects: use object_id struct in pack-reuse code a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id 3f83fd5e44 pack-objects: read delta base oid into object_id struct 0763671b8e nth_packed_object_oid(): use customary integer return 02bbbe9df9 worktree: drop unused code from get_main_worktree() 27f182b3fc blame: provide type of fingerprints pointer b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere df126ca142 t3400: make test clean up after itself 3c29e21eb0 t: drop debug `cat` calls cac439b56d t9810: drop debug `cat` call 91de82adc9 t4117: check for files using `test_path_is_file` 4ef346482d receive.denyCurrentBranch: respect all worktrees f8692114db t5509: use a bare repository for test push target 45f274fbb1 get_main_worktree(): allow it to be called in the Git directory fd0bc17557 completion: add diff --color-moved[-ws] 2ce6d075fa use strpbrk(3) to search for characters from a given set 2b3c430bce quote: use isalnum() to check for alphanumeric characters a51d9e8f07 t1050: replace test -f with test_path_is_file 3e96c66805 partial-clone: avoid fetching when looking for objects d0badf8797 partial-clone: demonstrate bugs in partial fetch 539052f42f run-command.h: fix mis-indented struct member 6c11c6a124 sparse-checkout: allow one-character directories in cone mode aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch e8ef1e8d6e am: convert "resume" variable to a struct bc8620b440 parse-options: convert "command mode" to a flag 62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE() 46fd7b3900 credential: allow wildcard patterns when matching config 82eb249853 credential: use the last matching username in the config 588c70e10f t0300: add tests for some additional cases 732f934408 t1300: add test for urlmatch with multiple wildcards 3fa0e04667 mailmap: add an additional email address for brian m. carlson 8a98758a8d stash push: support the --pathspec-from-file option 8c3713cede stash: eliminate crude option parsing 3f3d8068f5 doc: stash: synchronize <pathspec> description b22909144c doc: stash: document more options 0093abc286 doc: stash: split options from description (2) 2b7460d167 doc: stash: split options from description (1) 5f393dc3aa rm: support the --pathspec-from-file option fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags 73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure 6c69f22233 bisect: libify `bisect_next_all` 9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents 45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents e8e3ce6718 bisect: libify `bisect_checkout` ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents 7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()` 680e8a01e5 bisect: add enum to represent bisect returning codes bfacfce7d9 bisect--helper: introduce new `decide_next()` function b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0 292731c4c2 bisect--helper: change `retval` to `res` 16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays 7ec8125fba check-ignore: fix documentation and implementation to match 2607d39da3 doc-diff: use single-colon rule in rendering Makefile 0aa6ce3094 doc/config/push: use longer "--" line for preformatted example 20a5fd881a rev-list --count: comment on the use of count_right++ 63a58457e0 Merge branch 'py/missing-bracket' 51ebf55b93 The sixth batch for 2.26 f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints' 123538444f Merge branch 'jk/doc-credential-helper' e154451a2f Merge branch 'js/mingw-open-in-gdb' fc25a19265 Merge branch 'js/test-unc-fetch' 6365058605 Merge branch 'js/test-avoid-pipe' 966b69f02f Merge branch 'js/test-write-junit-xml-fix' d880c3de23 Merge branch 'jk/mailinfo-cleanup' 5d55554b1d Merge branch 'mr/show-config-scope' 9f3f38769d Merge branch 'rs/strbuf-insertstr' cbecc168d4 Merge branch 'rs/parse-options-concat-dup' 5af345a438 Merge branch 'bc/hash-independent-tests-part-8' 0460c109c3 Merge branch 'rs/name-rev-memsave' 6b9919c0a2 git-gui: add missing close bracket 5897e5ac96 Merge branch 'cs/german-translation' cf85a32eb6 git-gui: update German translation 5096e51c54 git-gui: extend translation glossary template with more terms 8b85bb1b70 git-gui: update pot template and German translation to current source code e68e29171c Sync with 2.25.1 c522f061d5 Git 2.25.1 10cdb9f38a rebase: rename the two primary rebase backends 2ac0d6273f rebase: change the default backend from "am" to "merge" 8295ed690b rebase: make the backend configurable via config setting 76340c8107 rebase tests: repeat some tests using the merge backend instead of am 980b482d28 rebase tests: mark tests specific to the am-backend with --am c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases 6d04ce75c4 git-prompt: change the prompt for interactive-based rebases 52eb738d6b rebase: add an --am option 8af14f0859 rebase: move incompatibility checks between backend options a bit earlier be50c938df git-rebase.txt: add more details about behavioral differences of backends befb89ce7c rebase: allow more types of rebases to fast-forward 9a70f3d4ae t3432: make these tests work with either am or merge backends 93122c985a rebase: fix handling of restrict_revision 55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer 8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling 7db00f0b3b t3406: simplify an already simple test e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty d48e5e21da rebase (interactive-backend): make --keep-empty the default e0020b2f82 prefix_path: show gitdir when arg is outside repo cc4f2eb828 doc: move credential helper info into gitcredentials(7) bfdd66e72f Sync with maint 7ae7e234c7 The fifth batch for 2.26 53c3be2c29 Merge branch 'tb/commit-graph-object-dir' 7b029ebaef Merge branch 'jk/index-pack-dupfix' aa21cc97bd Merge branch 'jk/alloc-cleanups' 883326077a Merge branch 'jh/notes-fanout-fix' f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule' 78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs' df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' 433b8aac2e Merge branch 'ds/sparse-checkout-harden' 4a77434bc8 Merge branch 'ld/p4-cleanup-processes' 8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone' 09e48400a3 Merge branch 'jk/get-oid-error-message-i18n' 4dbeecba27 Merge branch 'ag/edit-todo-drop-check' f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2' d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout' 251187084d Merge branch 'js/rebase-i-with-colliding-hash' c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix' 56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store' 0da63da794 Merge branch 'jn/promote-proto2-to-default' a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup' daef1b300b Merge branch 'hw/advice-add-nothing' 6141e0cc00 Merge branch 'js/convert-typofix' into maint 4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint 5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint 7137d6089b Merge branch 'ms/doc-bundle-format' into maint 52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint 0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint 1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint 153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint 8857657cc9 Merge branch 'jt/t5616-robustify' into maint 1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint f468972671 Merge branch 'bc/misconception-doc' into maint 6e69042e26 Merge branch 'bc/author-committer-doc' into maint 650ed395be Merge branch 'ds/refmap-doc' into maint 80b806f1a8 Merge branch 'bc/actualmente' into maint eceff4ba12 Merge branch 'rt/submodule-i18n' into maint 8a17eb7972 Merge branch 'jk/test-fixes' into maint 54bbadaeca Merge branch 'jk/asan-build-fix' into maint 8dbeba198e Merge branch 'ds/sparse-cone' into maint e361f36f61 Merge branch 'nd/switch-and-restore' into maint 4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint 5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint 9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint 3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint 3ab3185f99 pack-objects: support filters with bitmaps 84243da129 pack-bitmap: implement BLOB_LIMIT filtering 4f3bd5606a pack-bitmap: implement BLOB_NONE filtering cc4aa28506 bitmap: add bitmap_unset() function 2aaeb9ac41 rev-list: use bitmap filters for traversal 6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure 4eb707ebd6 rev-list: allow commit-only bitmap traversals ea047a8eb4 t5310: factor out bitmap traversal comparison 608d9c9365 rev-list: allow bitmaps when counting objects 55cb10f9b5 rev-list: make --count work with --objects 792f811998 rev-list: factor out bitmap-optimized routines d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs 08809c09aa mingw: add a helper function to attach GDB to the current process bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths de26f02db1 t9001, t9116: avoid pipes a2dc43414c MyFirstContribution: rephrase contact info e03f928e2a rev-list: fallback to non-bitmap traversal when filtering acac50dd8c pack-bitmap: fix leak of haves/wants object lists 551cf8b655 pack-bitmap: factor out type iterator initialization d8437c57fa The fourth batch for 2.26 a3dcf84df0 Merge branch 'js/convert-typofix' 0de2d1409b Merge branch 'js/ci-squelch-doc-warning' 0410c2ba31 Merge branch 'jb/multi-pack-index-docfix' 0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example' e99c325bb4 Merge branch 'ms/doc-bundle-format' afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix' db72f8c940 Merge branch 'jb/parse-options-message-fix' 3d2471ba85 Merge branch 'ma/filter-branch-doc-caret' b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path' 44cba9c4b3 Merge branch 'jc/skip-prefix' 556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index' 17e4a1b141 Merge branch 'hw/doc-git-dir' 4cf7f48891 Merge branch 'jk/push-default-doc' b783391018 Merge branch 'jk/clang-sanitizer-fixes' a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache' 3f7553acf5 Merge branch 'jt/t5616-robustify' 341f8a6476 Merge branch 'jk/escaped-wildcard-dwim' b486d2ee81 Merge branch 'jn/pretend-object-doc' 076ee3e8a2 tests: fix --write-junit-xml with subshells 2b0f19fa7a convert: fix typo c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors 1751b09a92 color.c: support bright aixterm colors 4a28eb0ae4 color.c: refactor color_output arguments f696a2b1c8 mailinfo: factor out some repeated header handling ffbea1816d mailinfo: be more liberal with header whitespace f447d0293e mailinfo: simplify parsing of header values b6537d83ee mailinfo: treat header values as C strings ef07659926 sparse-checkout: work with Windows paths 2631dc879d sparse-checkout: create 'add' subcommand 4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand 6fb705abcb sparse-checkout: extract add_patterns_from_input() b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config f2a2327a4a config: provide access to the current line number 923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values ceff1a1308 remote: clean-up config callback 1a83068c26 remote: clean-up by returning early to avoid one indentation 88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types 145d59f482 config: add '--show-scope' to print the scope of a config value 9a83d088ee submodule-config: add subomdule config scope e37efa40e1 config: teach git_config_source to remember its scope 5c105a842e config: preserve scope in do_git_config_sequence 6766e41b8a config: clarify meaning of command line scoping 6dc905d974 config: split repo scope to local and worktree a5cb4204b6 config: make scope_name non-static and rename it 30183894ea ci: ignore rubygems warning in the "Documentation" job 7a9f8ca805 parse-options: simplify parse_options_dup() c84078573e parse-options: const parse_options_concat() parameters f904f9025f parse-options: factor out parse_options_count() a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat() 517b60564e mailinfo: don't insert header prefix for handle_content_type() a91cc7fad0 strbuf: add and use strbuf_insertstr() eb31044ff7 pack-format: correct multi-pack-index description 9299f84921 diff-options.txt: avoid "regex" overload in example 7378ec90e1 doc: describe Git bundle format f3037657e8 t6024: update for SHA-256 edf04243b2 t6006: make hash size independent 5db24dcffd t6000: abstract away SHA-1-specific constants d341e0805d t5703: make test work with SHA-256 88ed241a7e t5607: make hash size independent 48c10cc0e6 t5318: update for SHA-256 f7ae8e69b6 t5515: make test hash independent e70649bb66 t5321: make test hash independent a30f93b143 t5313: make test hash independent a79eec220b t5309: make test hash independent 796d1383a3 t5302: make hash size independent 417e45e5e3 t4060: make test work with SHA-256 dfa5f53e78 t4211: add test cases for SHA-256 f743e8f5b3 t4211: move SHA-1-specific test cases into a directory 72f936b120 t4013: make test hash independent 5df0f11f07 t3311: make test work with SHA-256 07877f393c t3310: make test work with SHA-256 6025e898d6 t3309: make test work with SHA-256 7b1a1822fe t3308: make test work with SHA-256 94db7e3e93 t3206: make hash size independent db12505c2c t/lib-pack: support SHA-256 303b3c1c46 submodule: add newline on invalid submodule error 887a0fd573 add: change advice config variables used by the add API de93cc14ab The third batch for 2.26 ea46d9097b Merge branch 'mt/sparse-checkout-doc-update' ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix' b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend' 7ab963e122 Merge branch 'en/fill-directory-fixes-more' f52ab33616 Merge branch 'bc/hash-independent-tests-part-7' 25794d6ce9 Merge branch 'km/submodule-add-errmsg' d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity' 76c57fedfa Merge branch 'js/add-p-leftover-bits' 9a5315edfd Merge branch 'js/patch-mode-in-others-in-c' 381e8e9de1 Merge branch 'dl/test-must-fail-fixes' 395518cf7a parse-options: lose an unnecessary space in an error message 079f970971 name-rev: sort tip names before applying 2d53975488 name-rev: release unused name strings 977dc1912b name-rev: generate name strings only if they are better 1c56fc2084 name-rev: pre-size buffer in get_parent_name() ddc42ec786 name-rev: factor out get_parent_name() f13ca7cef5 name-rev: put struct rev_name into commit slab d689d6d82f name-rev: don't _peek() in create_or_update_name() 15a4205d96 name-rev: don't leak path copy in name_ref() 36d2419c9a name-rev: respect const qualifier 71620ca86c name-rev: remove unused typedef 3e2feb0d64 name-rev: rewrite create_or_update_name() a21781011f index-pack: downgrade twice-resolved REF_DELTA to die() dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout e1c5253951 t3305: check notes fanout more carefully and robustly e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st' ad2dd5bb63 commit-graph.c: remove path normalization, comparison 13c2499249 commit-graph.h: store object directory in 'struct commit_graph' 0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context' f38c92452d t7400: testcase for submodule status on unregistered inner git repos 5290d45134 tree-walk.c: break circular dependency with unpack-trees f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode e53ffe2704 sparse-checkout: escape all glob characters on write e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand bd64de42de sparse-checkout: unquote C-style strings over --stdin d585f0e799 sparse-checkout: write escaped patterns in cone mode 4f52c2ce6c sparse-checkout: properly match escaped characters 9abc60f801 sparse-checkout: warn on globs in cone patterns 145136a95a C: use skip_prefix() to avoid hardcoded string length 04e5b3f0b4 submodule foreach: replace $path with $sm_path in example 1793280e91 t5318: don't pass non-object directory to '--object-dir' da8063522f diff: move diff.wsErrorHighlight to "basic" config b98d188581 sha1-file: allow check_object_signature() to handle any repo 2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file() 7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare() c8123e72f6 streaming: allow open_istream() to handle any repo 5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile() a651946730 cache-tree: use given repo's hash_algo at verify_one() eb999b3295 diff: make diff_populate_filespec() honor its repo argument 5b0ca878e0 Sync with maint 344ee18728 The second batch 53a83299c7 Merge branch 'bc/misconception-doc' c9ccf9d09b Merge branch 'bc/author-committer-doc' 0d0fa20c40 Merge branch 'ss/t6025-modernize' 7050624abc Merge branch 'lh/bool-to-type-bool' 4b69f29271 Merge branch 'ds/refmap-doc' aff812ce3c Merge branch 'bc/actualmente' 38fb56e92a Merge branch 'rt/submodule-i18n' f0940743fa Merge branch 'js/builtin-add-i-cmds' 0afeb3fdf4 Merge branch 'jk/test-fixes' 808dab2b58 Merge branch 'jk/asan-build-fix' fec1ff97c2 Merge branch 'sg/completion-worktree' c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function' 11ad30b887 Merge branch 'hi/gpg-mintrustlevel' 96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases' d52adee779 Merge branch 'ds/graph-horizontal-edges' 6909474491 Merge branch 'am/update-pathspec-f-f-tests' 043426c8fd Merge branch 'ds/sparse-cone' 34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig' 8dd40c0472 traverse_trees(): use stack array for name entries 667b76ec58 walker_fetch(): avoid raw array length computation 9734b74a8f normalize_path_copy(): document "dst" size expectations 43f33e492a git-p4: avoid leak of file handle when cloning 19fa5ac333 git-p4: check for access to remote host earlier 6026aff5bb git-p4: cleanup better on error exit ca5b5cce62 git-p4: create helper function importRevisions() 4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable 5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce 837b3a6376 git-p4: make closeStreams() idempotent b0418303b1 sha1-name: mark get_oid() error messages for translation 2df1aa239c fetch: forgo full connectivity check if --filter 50033772d5 connected: verify promisor-ness of partial clone d82ad54945 git: update documentation for --git-dir 0ad7144999 .mailmap: map Yi-Jyun Pan's email c56c48dd07 grep: ignore --recurse-submodules if --no-index is given 8b2a1928f0 doc: drop "explicitly given" from push.default description cf82bff73f obstack: avoid computing offsets from NULL pointer 3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer d20bc01a51 avoid computing zero offsets from NULL pointer 7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero bc3f657f71 t1506: drop space after redirection operator e5d7b2f65c t1400: avoid "test" string comparisons 5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c c7a6207591 Sync with maint 7210ca4ee5 .mailmap: fix GGG authoship screwup 37a63faae5 t4124: only mark git command with test_must_fail a8c663cf65 t3507: use test_path_is_missing() 2def7f017c t3507: fix indentation e8a1c686ae t3504: do check for conflict marker after failed cherry-pick 1c9fd32fd2 t3419: stop losing return code of git command c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}() a781cd6fef t3415: stop losing return codes of git commands 86ce6e0dd1 t3310: extract common notes_merge_files_gone() 245b9ba0ba t3030: use test_path_is_missing() 4a6f11fd7b t2018: replace "sha" with "oid" 62e80fcb48 t2018: don't lose return code of git commands 30c0367668 t2018: teach do_checkout() to accept `!` arg 40caa5366a t2018: be more discerning when checking for expected exit codes b54128bb0b t5616: make robust to delta base change 4c616c2ba1 merge-recursive: use subtraction to flip stage ee798742bd merge-recursive: silence -Wxor-used-as-pow warning 39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin 3b2885ec9b submodule: fix status of initialized but not cloned submodules ace912bfb8 t7400: add a testcase for submodule status on empty dirs 4bb4fd4290 MyFirstContribution: add avenues for getting help 9e6d3e6417 sparse-checkout: detect short patterns 41de0c6fbc sparse-checkout: cone mode does not recognize "**" 7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone 47dbf10d8a clone: fix --sparse option with URLs 3c754067a1 sparse-checkout: create leading directories d622c34396 t1091: improve here-docs 522e641748 t1091: use check_files to reduce boilerplate 417be08d02 t1300: create custom config file without special characters 3de7ee369b t1300: fix over-indented HERE-DOCs 329e6ec397 config: fix typo in variable name 767a9c417e rebase -i: stop checking out the tip of the branch to rebase dfaed02862 fsmonitor: update documentation for hook version and watchman hooks e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2 d031049da3 completion: add support for sparse-checkout a402723e48 doc: sparse-checkout: mention --cone option 26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck b6992261de rebase -i: re-fix short SHA-1 collision d859dcad94 parse_insn_line(): improve error message when parsing failed d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects 92fb0db94c pack-objects: add checks for duplicate objects bb514de356 pack-objects: improve partial packfile reuse ff483026a9 builtin/pack-objects: introduce obj_is_packed() e704fc7978 pack-objects: introduce pack.allowPackReuse 2f4af77699 csum-file: introduce hashfile_total() 8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting() 59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile 40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains() 14fbd26044 ewah/bitmap: introduce bitmap_word_alloc() bc7a3d4dc0 The first batch post 2.25 cycle 09e393d913 Merge branch 'nd/switch-and-restore' 45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' 0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout' 36da2a8635 Merge branch 'es/unpack-trees-oob-fix' 42096c778d Merge branch 'bc/run-command-nullness-after-free-fix' 1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted' a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees' e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached' 9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting' 237a83a943 Merge branch 'dl/credential-netrc' a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir() 129510a067 t2405: clarify test descriptions and simplify test 4eaadc8493 t2405: use git -C and test_commit -C instead of subshells 773c60a45e t7410: rename to t2405-worktree-submodule.sh 7a2dc95cbc docs: mention when increasing http.postBuffer is valuable 1b13e9032f doc: dissuade users from trying to ignore tracked files 69e104d70e doc: provide guidance on user.name format 813f6025a5 docs: expand on possible and recommended user config options bc94e5862a doc: move author and committer information to git-commit(1) 7979dfe1d4 l10n: Update Catalan translation 81e3db42f3 templates: fix deprecated type option `--bool` c513a958b6 t6025: use helpers to replace test -f <path> 70789843bd t6025: modernize style 6a7aca6f01 doc: rm: synchronize <pathspec> description 856249c62a docs: use "currently" for the present time b40a50264a fetch: document and test --refmap="" a9ae8fde2e t3404: directly test the behavior of interest 22a69fda19 git-rebase.txt: update description of --allow-empty-message f1928f04b2 grep: use no. of cores as the default no. of threads 70a9fef240 grep: move driver pre-load out of critical section 1184a95ea2 grep: re-enable threads in non-worktree case 6c307626f1 grep: protect packed_git [re-]initialization c441ea4edc grep: allow submodule functions to run in parallel d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules() 1d1729caeb grep: replace grep_read_mutex by internal obj read lock 31877c9aec object-store: allow threaded access to object reading b1fc9da1c8 replace-object: make replace operations thread-safe d5b0bac528 grep: fix racy calls in grep_objects() faf123c730 grep: fix race conditions at grep_submodule() c3a5bb31c1 grep: fix race conditions on userdiff calls 0222540827 fetch: emphasize failure during submodule fetch 232378479e Sync with maint e4837b4406 t7800: don't rely on reuse_worktree_file() fbce03d329 t4018: drop "debugging" cat from hunk-header tests f65d07fffa Makefile: use compat regex with SANITIZE=address 849e43cc18 built-in add -i: accept open-ended ranges again d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files a4ffbbbb99 submodule.c: mark more strings for translation 0cbb60574e dir: point treat_leading_path() warning to the right place ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent 22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2 f365bf40a0 clean: demonstrate a bug with pathspecs b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x 277eb5af7c t5604: make hash independent 44b6c05b43 t5601: switch into repository to hash object 7a868c51c2 t5562: use $ZERO_OID 1b8f39fb0d t5540: make hash size independent a8c17e3bd6 t5537: make hash size independent 832072219c t5530: compute results based on object length 74ad99b1d8 t5512: abstract away SHA-1-specific constants ba1be1ab45 t5510: make hash size independent cba472d3ad t5504: make hash algorithm independent 82d5aeb1e6 t5324: make hash size independent 3c5e65cac1 t5319: make test work with SHA-256 235d3cddb8 t5319: change invalid offset for SHA-256 compatibility 1d86c8f0ce t5318: update for SHA-256 525a7f1769 t4300: abstract away SHA-1-specific constants 7a1bcb251b t4204: make hash size independent cb78f4f0fe t4202: abstract away SHA-1-specific constants 717c939d8f t4200: make hash size independent 08a9dd891c t4134: compute appropriate length constant 215b60bf07 t4066: compute index line in diffs 194264c185 t4054: make hash-size independent 7d5ecd775d completion: list paths and refs for 'git worktree add' 3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands 3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options 367efd54b3 completion: return the index of found word from __git_find_on_cmdline() d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function 2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper 54887b4689 gpg-interface: add minTrustLevel as a configuration option 684ceae32d fetch: default to protocol version 2 33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION 8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate b9ab170752 config doc: protocol.version is not experimental 07ef3c6604 fetch test: use more robust test for filtered objects d6509da620 fetch test: mark test of "skipping" haves as v0-only a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function bf66db37f1 add: use advise function to display hints c958d3bd0a graph: fix collapse of multiple edges 8588932e20 graph: add test to demonstrate horizontal line bug d0d0a357a1 t: directly test parse_pathspec_file() 568cabb2fe t: fix quotes tests for --pathspec-from-file f94f7bd00d t: add tests for error conditions with --pathspec-from-file b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job 12acdf573a built-in add -p: handle Escape sequences more efficiently e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode 04f816b125 built-in add -p: respect the `interactive.singlekey` config setting a5e46e6b01 terminal: add a new function to read a single keystroke 9ea416cb51 terminal: accommodate Git for Windows' default terminal 94ac3c31f7 terminal: make the code of disable_echo() reusable 08b1ea4c39 built-in add -p: handle diff.algorithm 180f48df69 built-in add -p: support interactive.diffFilter 1e4ffc765d t3701: adjust difffilter test c81638541c submodule add: show 'add --dry-run' stderr when aborting 8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token 56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token d0654dc308 Git 2.25 b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po 4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'" ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1 e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master 1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' d78a1968c5 Merge branch 'ma/config-advice-markup-fix' a20ae3ee29 l10n: Update Catalan translation 49e268e23e mingw: safeguard better against backslashes in file names 4c6c7971e0 unpack-trees: correctly compute result count 63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1 75449c1b39 l10n: de.po: Reword generation numbers 6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t) 3901d2c6bd config/advice.txt: fix description list separator 7a6a90c6ec Git 2.25-rc2 1f5f3ffe5c Merge branch 'ds/graph-assert-fix' a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix' 202f68b252 Merge branch 'pm/am-in-body-header-doc-update' 7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix' c5dc20638b Merge branch 'do/gitweb-typofix-in-comments' fe47c9cb5f Merge https://github.com/prati0100/git-gui a1087c9367 graph: fix lack of color in horizontal lines 0d251c3291 graph: drop assert() for merge with two collapsing parents 4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper 573117dfa5 unpack-trees: watch for out-of-range index position e701bab3e9 restore: invalidate cache-tree when removing entries with --staged 1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command fa74180d08 checkout: don't revert file on ambiguous tracking branches 2957709bd4 parse_branchname_arg(): extract part as new function 5020f6806a t2018: improve style of if-statement 7ffb54618b t2018: add space between function name and () 63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH 065027ee1a string-list: note in docs that callers can specify sorting function 26f924d50e unpack-trees: exit check_updates() early if updates are not wanted 042ed3e048 The final batch before -rc2 0f1930cd1b Merge branch 'ds/sparse-cone' 037f067587 Merge branch 'ds/commit-graph-set-size-mult' f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify' c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode' a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' c4117fcb97 Merge branch 'pb/clarify-line-log-doc' 556f0258df Merge branch 'ew/packfile-syscall-optim' 5814d44d9b doc: submodule: fix typo for command absorbgitdirs 7047f75f22 editorconfig: indent text files with tabs 60440d72db sha1-file: document how to use pretend_object_file 7fdc5f296f l10n: es: 2.25.0 round #1 f8740c586b am: document that Date: can appear as an in-body header 4e2c4c0d4f gitweb: fix a couple spelling errors in comments 421c0ffb02 multi-pack-index: correct configuration in documentation 757ff352bd Documentation/git-sparse-checkout.txt: fix a typo 0d2116c644 Merge branch 'zs/open-current-file' 9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u) 3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master 4c5081614c l10n: fr.po v2.25.0 rnd 1 5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0 63020f175f commit-graph: prefer default size_mult when given zero 224c7d70fa mingw: only test index entries for backslashes, not tree entries 9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED 8679ef24ed Git 2.25-rc1 a82027e9e6 Merge branch 'js/use-test-tool-on-path' 13432fc6dd Merge branch 'js/mingw-reserved-filenames' e0e1ac5db0 Merge branch 'en/rebase-signoff-fix' b76a244c9d Merge branch 'em/freebsd-cirrus-ci' bc855232bc Merge branch 'bk/p4-misc-usability' 763a59e71c merge-recursive: remove unnecessary oid_eq function 44143583b7 sparse-checkout: use extern for global variables d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master 13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1 786f4d2405 git-gui: allow opening currently selected file in default app 4fd683b6a3 sparse-checkout: document interactions with submodules de11951b03 sparse-checkout: list directories in cone mode 0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0 578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) 173fff68da Merge tag 'v2.25.0-rc0' into git-po-master f1842ff531 t2018: remove trailing space from test description 20a67e8ce9 t3008: find test-tool through path lookup 9e341f62ca l10n: Update Catalan translation 4e61b2214d packfile: replace lseek+read with pread ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision 2be45868a8 doc: log, gitk: document accepted line-log diff formats 280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD 0a76bd7381 mailmap: mask accentless variant for Công Danh 99c33bed56 Git 2.25-rc0 d2189a721c Merge branch 'en/fill-directory-fixes' 8be0a428d6 Merge branch 'rs/test-cleanup' 65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string' c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 45b96a6fa1 Merge branch 'js/add-p-in-c' ccc292e862 Merge branch 'jc/drop-gen-hdrs' dfee504bee Merge branch 'ja/doc-markup-cleanup' 87cbb1ca66 Merge branch 'rs/ref-read-cleanup' 20aa6d88b7 Merge branch 'rb/p4-lfs' fcd5b55f56 Merge branch 'pb/submodule-doc-xref' 4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free' ba6b66281e Merge branch 'ln/userdiff-elixir' bd72a08d6c Merge branch 'ds/sparse-cone' f3c520e17f Merge branch 'sg/name-rev-wo-recursion' 6514ad40a1 Merge branch 'ra/t5150-depends-on-perl' 17066bea38 Merge branch 'dl/format-patch-notes-config-fixup' 135365dd99 Merge branch 'am/pathspec-f-f-checkout' ff0cb70d45 Merge branch 'am/pathspec-from-file' 4dc42c6c18 mingw: refuse paths containing reserved names 98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16 c480eeb574 commit --interactive: make it work with the built-in `add -i` cee6cb7300 built-in add -p: implement the "worktree" patch modes 52628f94fc built-in add -p: implement the "checkout" patch modes 6610e4628a built-in stash: use the built-in `git add -p` if so configured 90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting 36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes d2a233cb8b built-in add -p: prepare for patch modes other than "stage" 761e3d26bb sparse-checkout: improve OS ls compatibility 6579d93a97 contrib/credential/netrc: work outside a repo 1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI b441717256 t1507: inline full_name() 9291e6329e t1507: run commands within test_expect_success 5236fce6b4 t1507: stop losing return codes of git commands 10812c2337 t1501: remove use of `test_might_fail cp` 62d58cda69 t1409: use test_path_is_missing() b87b02cfe6 t1409: let sed open its own input file 9b92070e52 t1307: reorder `nongit test_must_fail` 3595d10c26 t1306: convert `test_might_fail rm` to `rm -f` f511bc02ed t0020: use ! check_packed_refs_marked f6041abdcd t0020: don't use `test_must_fail has_cr` f46c243e66 t0003: don't use `test_must_fail attr_check` 99c049bc4c t0003: use test_must_be_empty() 3738439c77 t0003: use named parameters in attr_check() 7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err() b8afb908c2 t/lib-git-p4: use test_path_is_missing() 4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases 6836d2fe06 dir.c: use st_add3() for allocation size c847dfafee dir: consolidate similar code in treat_directory() 777b420347 dir: synchronize treat_leading_path() and read_directory_recursive() b9670c1f5e dir: fix checks on common prefix directory 5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit 23cbe427c4 Merge branch 'py/console-close-esc' 124a895811 t4015: improve coverage of function context test 509efef789 commit: forbid --pathspec-from-file --all 12029dc57d t3434: mark successful test as such e0f9095aaa notes.h: fix typos in comment 675ef6bab8 t6030: don't create unused file 01ed17dc8c t5580: don't create unused file f670adb49b t3501: don't create unused file 1e1ccbfdd3 git-gui: allow closing console window with Escape 7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays. b02fd2acca The sixth batch 59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex' e3b72391d1 Merge branch 'rs/commit-export-env-simplify' 43bf44e23a Merge branch 'rs/archive-zip-code-cleanup' 4438a1a59f Merge branch 'js/t3404-indent-fix' 3a44db2ed2 Merge branch 'dr/branch-usage-casefix' 8bc481f4f6 Merge branch 'sg/t9300-robustify' 011fc2e88e Merge branch 'js/add-i-a-bit-more-tests' d1c0fe8d9b Merge branch 'dl/range-diff-with-notes' 26c816a67d Merge branch 'hw/doc-in-header' f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 71a7de7a99 Merge branch 'dl/rebase-with-autobase' c9f5fc9114 Merge branch 'dl/test-cleanup' 6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap' 3beff388b2 Merge branch 'js/builtin-add-i-cmds' 4755a34c47 Merge branch 'dd/time-reentrancy' 37c2619d91 Merge branch 'ag/sequencer-todo-updates' 608e380502 git-p4: show detailed help when parsing options fail e2aed5fd5b git-p4: yes/no prompts should sanitize user text 571fb96573 fix-typo: consecutive-word duplications f371984613 Makefile: drop GEN_HDRS 2e4083198d built-in add -p: show helpful hint when nothing can be staged 54d9d9b2ee built-in add -p: only show the applicable parts of the help text ade246efed built-in add -p: implement the 'q' ("quit") command d6cf873340 built-in add -p: implement the '/' ("search regex") command 9254bdfb4f built-in add -p: implement the 'g' ("goto") command bcdd297b78 built-in add -p: implement hunk editing b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf" 11f2c0dae8 built-in add -p: coalesce hunks after splitting them 510aeca199 built-in add -p: implement the hunk splitting feature 0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions 5906d5de77 built-in app -p: allow selecting a mode change as a "hunk" 47dc4fd5eb built-in add -p: handle deleted empty files 80399aec5a built-in add -p: support multi-file diffs 7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed 12c24cf850 built-in add -p: color the prompt and the help text 25ea47af49 built-in add -p: adjust hunk headers as needed e3bd11b4eb built-in add -p: show colored hunks by default 1942ee44e8 built-in add -i: wire up the new C code for the `patch` command f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C d1b1384d61 userdiff: remove empty subexpression from elixir regex df5be01669 doc: indent multi-line items in list fd5041e127 doc: remove non pure ASCII characters 190a65f9db sparse-checkout: respect core.ignoreCase in cone mode 1d7297513d notes: break set_display_notes() into smaller functions 66f79ee23d config/format.txt: clarify behavior of multiple format.notes cc2bd5c45d gitmodules: link to gitsubmodules guide 99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed 8c02fe6060 t7004: don't create unused file cb05d6a5ed t4256: don't create unused file c5c4eddd56 dir: break part of read_directory_recursive() out for reuse 072a231016 dir: exit before wildcard fall-through if there is no wildcard 2f5d3847d4 dir: remove stray quote character in comment a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories" 452efd11fb t3011: demonstrate directory traversal failures ea94b16fb8 git-p4: honor lfs.storage configuration variable 51a0a4ed95 bisect--helper: avoid use-after-free d32e065a91 Merge branch 'kk/branch-name-encoding' ad05a3d8e5 The fifth batch 7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix' b089e5e6cb Merge branch 'em/test-skip-regex-illseq' 930078ba39 Merge branch 'hi/gpg-use-check-signature' 08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode' 7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk' 55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm' 41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress' 5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise' dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix' d37cfe3b5c Merge branch 'dl/pretty-reference' 99c4ff1bda Merge branch 'dl/submodule-set-url' 55d607d85b Merge branch 'js/mingw-inherit-only-std-handles' c58ae96fc4 Merge branch 'am/pathspec-from-file' 7c88714262 Merge branch 'po/bundle-doc-clonable' 5d9324e0f4 Merge branch 'ra/rebase-i-more-options' 7034cd094b Sync with Git 2.24.1 09ac67a183 format-patch: move git_config() before repo_init_revisions() 8164c961e1 format-patch: use --notes behavior for format.notes 452538c358 notes: extract logic into set_display_notes() e6e230eeae notes: create init_display_notes() helper 1e6ed5441a notes: rename to load_display_notes() 2866fd284c name-rev: cleanup name_ref() 49f7a2fde9 name-rev: eliminate recursion in name_rev() fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name' e05e8cf074 archive-zip: use enum for compression method 39acfa3d22 git gui: fix branch name encoding error 11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description 8cf8f9b4aa t3404: fix indentation 4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs 147ee35558 commit: use strbuf_add() to add a length-limited string 559c6fc317 The fourth batch 56e6c16394 Merge branch 'dl/lore-is-the-archive' 3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive' 7cb0d37f6d Merge branch 'tg/perf-remove-stale-result' 403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick' f0cf2fee5d Merge branch 'hi/grep-do-not-return-void' 391fb22ac7 Merge branch 'rs/use-skip-prefix-more' 92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd' 4ba74ca901 Merge branch 'rs/test-cleanup' f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick' ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9' 8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters 3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances dd432a6ecf name-rev: restructure parsing commits and applying date cutoff dd090a8a37 name-rev: pull out deref handling from the recursion 766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev() bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation e0c4da6f2a name-rev: avoid unnecessary cast in name_ref() c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name() c593a26348 t6120-describe: modernize the 'check_describe' helper abcf857300 range-diff: clear `other_arg` at end of function f8675343d7 range-diff: mark pointers as const 828765dfe0 t3206: fix incorrect test name 0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early 21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile b4bbbbd5a2 apply --allow-overlap: fix a corner case 89c8559367 git add -p: use non-zero exit code when the diff generation failed e91162be9c t3701: verify that the diff.algorithm config setting is handled 0c3222c4f3 t3701: verify the shown messages when nothing can be added 24be352d52 t3701: add a test for the different `add -p` prompts 8539b46534 t3701: avoid depending on the TTY prerequisite 0f0fba2cc8 t3701: add a test for advanced split-hunk editing 53a06cf39b Git 2.24.1 67af91c47a Sync with 2.23.1 a7312d1a28 Git 2.23.1 7fd9fd94fb Sync with 2.22.2 d9589d4051 Git 2.22.2 5421ddd8d0 Sync with 2.21.1 367f12b7e9 Git 2.21.1 20c71bcf67 Merge branch 'fix-msys2-quoting-bugs' 7d8b676992 mingw: sh arguments need quoting in more circumstances d9061ed9da t7415: drop v2.20.x-specific work-around 04522edbd4 mingw: fix quoting of empty arguments for `sh` 49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly fc346cb292 Sync with 2.20.2 4cd1cf31ef Git 2.20.2 c154745074 submodule: defend against submodule.update = !command in .gitmodules 4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x d851d94151 Sync with 2.19.3 caccc527ca Git 2.19.3 7c9fbda6e2 Sync with 2.18.2 9877106b01 Git 2.18.2 14af7ed5a9 Sync with 2.17.3 a5ab8d0317 Git 2.17.3 bb92255ebe fsck: reject submodule.update = !command in .gitmodules bdfef0492c Sync with 2.16.6 eb288bc455 Git 2.16.6 68440496c7 test-drop-caches: use `has_dos_drive_prefix()` 9ac92fed5b Sync with 2.15.4 7cdafcaacf Git 2.15.4 e904deb89d submodule: reject submodule.update = !command in .gitmodules d3ac8c3f27 Sync with 2.14.6 66d2a6159f Git 2.14.6 083378cc35 The third batch 88bd37a2d0 Merge branch 'js/pkt-line-h-typofix' 473b431410 Merge branch 'us/unpack-trees-fsmonitor' e0f9ec9027 Merge branch 'sg/test-bool-env' fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset' e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere' 88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory' 8feb47e882 Merge branch 'dl/t5520-cleanup' 6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree' 57d46bc602 Merge branch 'mg/doc-submodule-status-cached' 75bd003c7b Merge branch 'js/git-svn-use-rebase-merges' f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix' c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits' 36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree' cf91c31688 Merge branch 'sg/unpack-progress-throughput' ef6104581d Merge branch 'pb/submodule-update-fetches' 7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix' f3c7bfdde2 Merge branch 'dl/range-diff-with-notes' 9502b616f1 Merge branch 'jh/userdiff-python-async' 76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2' 995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label' f7998d9793 Merge branch 'js/builtin-add-i' 917d0d6234 Merge branch 'js/rebase-r-safer-label' 56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers' 2763530048 Merge branch 'jg/revert-untracked' fa38ab68b0 git-gui: revert untracked files by deleting them d9c6469f38 git-gui: update status bar to track operations 29a9366052 git-gui: consolidate naming conventions 0bb313a552 xdiff: unignore changes in function context 2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names' 65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods' 5532ebdeb7 Merge branch 'fix-mingw-quoting-bug' 76a681ce9c Merge branch 'dubiously-nested-submodules' dd53ea7220 Merge branch 'turn-on-protectntfs-by-default' f82a97eb91 mingw: handle `subst`-ed "DOS drives" 7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams' d2c84dad1c mingw: refuse to access paths with trailing spaces or periods 379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh 817ddd64c2 mingw: refuse to access paths with illegal characters cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors 7530a6287e quote-stress-test: allow skipping some trials 35edce2056 t6130/t9350: prepare for stringent Win32 path validation 55953c77c0 quote-stress-test: accept arguments to test via the command-line ad15592529 tests: add a helper to stress test argument quoting a8dee3ca61 Disallow dubiously-nested submodule git directories 9102f958ee protect_ntfs: turn on NTFS protection by default 91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams 6d8684161e mingw: fix quoting of arguments 3a85dc7d53 is_ntfs_dotgit(): speed it up 7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses 288a74bcd2 is_ntfs_dotgit(): only verify the leading segment a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark cae0bc09ab rebase: fix format.useAutoBase breakage 945dc55dda format-patch: teach --no-base 700e006c5d t4014: use test_config() a749d01e1d format-patch: fix indentation 0c47e06176 t3400: demonstrate failure with format.useAutoBase d9b31db2c4 t7700: stop losing return codes of git commands 3699d69df0 t7700: make references to SHA-1 generic dcf9a748ca t7700: replace egrep with grep cfe5eda02a t7700: consolidate code into test_has_duplicate_object() ae475afc0f t7700: consolidate code into test_no_missing_in_packs() 14b7664df8 doc: replace LKML link with lore.kernel.org d23f9c8e04 RelNotes: replace Gmane with real Message-IDs dcee037228 doc: replace MARC links with lore.kernel.org a9aecc7abb checkout, restore: support the --pathspec-from-file option cfd9376c1d doc: restore: synchronize <pathspec> description 8ea1189eac doc: checkout: synchronize <pathspec> description 6fdc9ad259 doc: checkout: fix broken text reference 1d022bb43f doc: checkout: remove duplicate synopsis bebb5d6d6b add: support the --pathspec-from-file option 21bb3083c3 cmd_add: prepare for next patch 4778452597 Merge branch 'prevent-name-squatting-on-windows' a7b1ad3b05 Merge branch 'jk/fast-import-unsafe' 525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()` e1d911dd4c mingw: disallow backslash characters in tree objects' file names 0060fd1511 clone --recurse-submodules: prevent name squatting on Windows a52ed76142 fast-import: disallow "feature import-marks" by default 68061e3470 fast-import: disallow "feature export-marks" by default 019683025f fast-import: delay creating leading directories for export-marks e075dba372 fast-import: stop creating leading directories for import-marks 11e934d56e fast-import: tighten parsing of boolean command line options 816f806786 t9300: create marks files for double-import-marks test f94804c1f2 t9300: drop some useless uses of cat 4f3e57ef13 submodule--helper: advise on fatal alternate error 10c64a0b3c Doc: explain submodule.alternateErrorStrategy ec48540fe8 packfile.c: speed up loading lots of packfiles 3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value a4fb016ba1 pkt-line: fix a typo 0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data 228f53135a The second batch 6c630f237e Merge branch 'jk/gitweb-anti-xss' 3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell' 4775e02a5c Merge branch 'ma/t7004' a6c6f8d02a Merge branch 'js/complete-svn-recursive' 3ae8defaf9 Merge branch 'jk/send-pack-remote-failure' aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix' 4ab9616c76 Merge branch 'sg/skip-skipped-prereq' 723a8adba5 Merge branch 'ds/test-read-graph' 9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation' 406ca29e0d Merge branch 'rs/parse-options-dup-null-fix' fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging' 8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion' ef8f621045 Merge branch 'dl/complete-rebase-onto' 3c3e5d0ea2 Merge branch 'tg/stash-refresh-index' 43c5fe1c1d Merge branch 'nn/doc-rebase-merges' 6511cb33c9 Merge branch 'dd/sequencer-utf8' f165457618 Merge branch 'jk/remove-sha1-to-hex' a774064fb0 Merge branch 'dj/typofix-merge-strat' ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates' d2489ce92c Merge branch 'rs/skip-iprefix' 376e7309e1 Merge branch 'ln/userdiff-elixir' 9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log' d3096d2ba6 Merge branch 'en/doc-typofix' 26f20fa3fc Merge branch 'ns/test-desc-typofix' ffd130a363 Merge branch 'en/t6024-style' 5149902ff9 Merge branch 'en/misc-doc-fixes' bcb06e204c Merge branch 'js/fetch-multi-lockfix' d08daec001 Merge branch 'rs/trace2-dots' fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix' bad5ed39cd Merge branch 'cb/curl-use-xmalloc' 7ab2088255 Merge branch 'rt/fetch-message-fix' f089ddd56a Merge branch 'es/myfirstcontrib-updates' 3c90710c0c Merge branch 'hw/config-doc-in-header' d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code' 5444d52866 Merge branch 'js/vreportf-wo-buffering' 05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add' ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides' 532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default' dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists' fac9ab1419 Merge branch 'ma/bisect-doc-sample-update' a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix' 0be5caf97c Merge branch 'jc/log-graph-simplify' 0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck' 2e697ced9d built-in add -i: offer the `quit` command d7633578b5 built-in add -i: re-implement the `diff` command 8746e07277 built-in add -i: implement the `patch` command ab1e1cccaf built-in add -i: re-implement `add-untracked` in C c54ef5e424 built-in add -i: re-implement `revert` in C a8c45be939 built-in add -i: implement the `update` command f37c226454 built-in add -i: prepare for multi-selection commands c08171d156 built-in add -i: allow filtering the modified files list 0c3944a628 add-interactive: make sure to release `rev.prune_data` 4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance 867fc7f310 grep: don't return an expression from pcre2_free() c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables 72b006f4bf gpg-interface: prefer check_signature() for GPG verification 7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r ccd469450a date.c: switch to reentrant {gm,local}time_r 271c351b2f t7811: don't create unused file 65efb42862 t9300: don't create unused file f6b9413baf sequencer: fix a memory leak in sequencer_continue() 3eae30e464 doc: replace public-inbox links with lore.kernel.org 46c67492aa doc: recommend lore.kernel.org over public-inbox.org 5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects 17a4ae92ea t7700: s/test -f/test_path_is_file/ d2eee32a89 t7700: move keywords onto their own line 7a1c8c2346 t7700: remove spaces after redirect operators 09279086e8 t7700: drop redirections to /dev/null 756ee7fc9f t7501: stop losing return codes of git commands 38c1aa01de t7501: remove spaces after redirect operators 763b47bafa t5703: stop losing return codes of git commands eacaa1c180 t5703: simplify one-time-sed generation logic a29b2429e5 t5317: use ! grep to check for no matching lines 6c37f3ec1b t5317: stop losing return codes of git commands b66e0a1773 t4138: stop losing return codes of git commands afd43c9905 t4015: use test_write_lines() 946d2353a3 t4015: stop losing return codes of git commands 50cd31c652 t3600: comment on inducing SIGPIPE in `git rm` 3b737381d8 t3600: stop losing return codes of git commands 0d913dfa7e t3600: use test_line_count() where possible 29a40b5a67 t3301: stop losing return codes of git commands 9b5a9fa60a t0090: stop losing return codes of git commands 17aa9d9c1a t0014: remove git command upstream of pipe 77a946be98 apply-one-time-sed.sh: modernize style 176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job ed254710ee test: use test_must_be_empty F instead of test_cmp empty F c74b3cbb83 t7812: add missing redirects 213dabf49d test: use test_must_be_empty F instead of test -z $(cat F) c93a5aaec8 t1400: use test_must_be_empty 6e4826ea75 t1410: use test_line_count a5d04a3ef9 t1512: use test_line_count 54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd() 2059e79c0d name-rev: use skip_prefix() instead of starts_with() 1768aaf01d push: use skip_prefix() instead of starts_with() ec6ee0c07a shell: use skip_prefix() instead of starts_with() 7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with() a6293f5d28 fetch: use skip_prefix() instead of starts_with() 13ca8fb79e t5150: skip request-pull test if Perl is disabled ecc0869080 commit-graph: use start_delayed_progress() 44a4693bfc progress: create GIT_PROGRESS_DELAY 528d9e6d01 t/perf: don't depend on Git.pm b8dcc45387 perf-lib: use a single filename for all measurement types fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk' d82dfa7f5b rebase -i: finishing touches to --reset-author-date 1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory 393adf7a6f sequencer: directly call pick_commits() from complete_action() a2dd67f105 rebase: fill `squash_onto' in get_replay_opts() 3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function 34065541e3 sequencer: update `done_nr' when skipping commands in a todo list 8638114e06 sequencer: update `total_nr' when adding an item to a todo list 0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions 9917eca794 l10n: zh_TW: add translation for v2.24.0 0a8e3036a3 reset: parse rev as tree-ish in patch mode f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits 8d483c8408 doc: document 'git submodule status --cached' befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later 9a780a384d mingw: spawned processes need to inherit only standard handles c5a03b1e29 mingw: work around incorrect standard handles eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool 43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values 2d05ef2778 sequencer: fix empty commit check when amending ea8b7be147 git svn: stop using `rebase --preserve-merges` 67a6ea6300 gpg-interface: limit search for primary key fingerprint 392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern cff4e9138d sparse-checkout: check for dirty status 416adc8711 sparse-checkout: update working directory in-process for 'init' f75a69f880 sparse-checkout: cone mode should not interact with .gitignore fb10ca5b54 sparse-checkout: write using lockfile 99dfa6f970 sparse-checkout: use in-process update for disable subcommand e091228e17 sparse-checkout: update working directory in-process e9de487aa3 sparse-checkout: sanitize for nested folders 4dcd4def3c unpack-trees: add progress to clear_ce_flags() eb42feca97 unpack-trees: hash less in cone mode af09ce24a9 sparse-checkout: init and set in cone mode 96cc8ab531 sparse-checkout: use hashmaps for cone patterns 879321eb0b sparse-checkout: add 'cone' mode e6152e35ff trace2: add region in clear_ce_flags 72918c1ad9 sparse-checkout: create 'disable' subcommand 7bffca95ea sparse-checkout: add '--stdin' option to set subcommand f6039a9423 sparse-checkout: 'set' subcommand d89f09c828 clone: add --sparse mode bab3c35908 sparse-checkout: create 'init' subcommand 94c0956b60 sparse-checkout: create builtin with 'list' subcommand 679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files df6d3d6802 lib-bash.sh: move `then` onto its own line 2a02262078 t5520: replace `! git` with `test_must_fail git` c245e58bb6 t5520: remove redundant lines in test cases a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp e959a18ee7 t5520: don't put git in upstream of pipe 5540ed27bc t5520: test single-line files by git with test_cmp dd0f1e767b t5520: use test_cmp_rev where possible 979f8891cc t5520: replace test -{n,z} with test-lib functions 3037d3db90 t5520: use test_line_count where possible 93a9bf876b t5520: remove spaces after redirect operator ceeef863de t5520: replace test -f with test-lib functions 4c8b046f82 t5520: let sed open its own input 53c62b9810 t5520: use sq for test case names e8d1eaf9b4 t5520: improve test style 2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals 8cb7980382 t0000: test multiple local assignment 5b583e6a09 format-patch: pass notes configuration to range-diff bd36191886 range-diff: pass through --notes to `git log` 9f726e1b87 range-diff: output `## Notes ##` header 3bdbdfb7a5 t3206: range-diff compares logs with commit notes 75c5aa0701 t3206: s/expected/expect/ 79f3950d02 t3206: disable parameter substitution in heredoc 3a6e48e9f7 t3206: remove spaces after redirect operators 26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish 077a1fda82 userdiff: support Python async functions 3798149a74 SubmittingPatches: use `--pretty=reference` 1f0fc1db85 pretty: implement 'reference' format 618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type 0df621172d pretty: provide short date format ac52d9410e t4205: cover `git log --reflog -z` blindspot 3e8ed3b93e pretty.c: inline initalize format_context 4982516451 revision: make get_revision_mark() return const pointer f0f9de2bd7 completion: complete `tformat:` pretty format fb2ffa77a6 SubmittingPatches: remove dq from commit reference bae74c9dfb pretty-formats.txt: use generic terms for hash bd00717eab SubmittingPatches: use generic terms for hash 9d45ac4cbf rev-list-options.txt: remove reference to --show-notes 828e829b9e argv-array: add space after `while` e440fc5888 commit: support the --pathspec-from-file option 66a25a7242 doc: commit: synchronize <pathspec> description 64bac8df97 reset: support the `--pathspec-from-file` option d137b50756 doc: reset: synchronize <pathspec> description 24e4750c96 pathspec: add new function to parse file 0dbc4a0edf ci(osx): update homebrew-cask repository with less noise e02058a729 sequencer: handle rebase-merges for "onto" message bae60ba7e9 builtin/unpack-objects.c: show throughput progress 2d92ab32fd rev-parse: make --show-toplevel without a worktree an error 9e5afdf997 fetch: add trace2 instrumentation 4c4066d95d run-command: move doc to run-command.h 6c51cb525d trace2: move doc to trace2.h 7db0305438 parse-options: add link to doc file in parse-options.h d95a77d059 submodule-config: move doc to submodule-config.h f3b9055624 credential: move doc to credential.h bbcfa3002a tree-walk: move doc to tree-walk.h 971b1f24a2 argv-array: move doc to argv-array.h f1ecbe0f53 trace: move doc to trace.h 13aa9c8b70 cache: move doc to cache.h c0be43f898 sigchain: move doc to sigchain.h 19ef3ddd36 pathspec: move doc to pathspec.h 301d595e72 revision: move doc to revision.h 3a1b3415d9 attr: move doc to attr.h 126c1ccefb refs: move doc to refs.h d27eb356bf remote: move doc to remote.h and refspec.h 405c6b1fbc sha1-array: move doc to sha1-array.h d3d7172e40 merge: move doc to ll-merge.h 3f1480b745 graph: move doc to graph.h and graph.c 266f03eccd dir: move doc to dir.h 13c4d7eb22 diff: move doc to diff.h and diffcore.h cd5522271f rebase -r: let `label` generate safer labels 867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()` 8c15904462 built-in add -i: implement the `help` command 3d965c7674 built-in add -i: use color in the main loop 68db1cbf8e built-in add -i: support `?` (prompt help) 76b743234c built-in add -i: show unique prefixes of the commands 6348bfba58 built-in add -i: implement the main loop a376e37b2c gitweb: escape URLs generated by href() b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI f28bceca75 t/gitweb-lib.sh: drop confusing quotes 0eba60c9b7 t9502: pass along all arguments in xss helper 932757b0cc INSTALL: use existing shell scripts as example b018719927 t7004: check existence of correct tag 1daaebcaa5 built-in add -i: color the header in the `status` command 5e82b9e4d2 built-in add -i: implement the `status` command e4cb659ebd diff: export diffstat interface f83dff60a7 Start to implement a built-in version of `git add --interactive` df53c80822 stash: make sure we have a valid index before writing it ad7a403268 send-pack: check remote ref status on pack-objects failure d91ce887c9 t6120-describe: correct test repo history graph in comment 1f9247a3bd completion: tab-complete "git svn --recursive" 603960b50e promisor-remote: remove fetch_if_missing=0 e362fadcd0 clone: remove fetch_if_missing=0 169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL 51bd6be32d mingw: use COPY_ARRAY for copying array 4bd0593e0f test-tool: use 'read-graph' helper e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway d784d978f6 t4215: use helper function to check output 61eea521fe fsmonitor: do not compare bitmap size with size of split index b19f3fe9dd hex: drop sha1_to_hex() c1ce9c06d0 completion: learn to complete `git rebase --onto=` f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase aa6d7f93ed hex: drop sha1_to_hex_r() 52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch 5772b0c745 sequencer: reencode old merge-commit message e0eba649e8 bundle-verify: add --quiet 79862b6b77 bundle-create: progress output control 73c3253d75 bundle: framework for options before bundle file 68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in" b375744274 sequencer: reencode squashing commit's message 019a9d8362 sequencer: reencode revert/cherry-pick's todo list 0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding 1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary d9f6f3b619 The first batch post 2.24 cycle 28014c1084 Merge branch 'bc/hash-independent-tests-part-6' 57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree' c22f63c40f Merge branch 'pb/pretty-email-without-domain-part' 5731ca3657 Merge branch 'hw/remove-api-docs-placeholder' 14b58c62bc Merge branch 'sg/commit-graph-usage-fix' eff313f8a7 Merge branch 'dl/apply-3way-diff3' db806d7064 Merge branch 'sg/dir-trie-fixes' f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix' 8f1119b988 Merge branch 'wb/midx-progress' d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes' 0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges' 8f40d89783 Merge branch 'hv/bitshift-constants-in-blame' d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head' 5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer' b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc' 15d9f3dc66 Merge branch 'es/walken-tutorial' 026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor' ed28358833 convert: use skip_iprefix() in validate_encoding() 89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding() 03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules ae821ffe83 multimail: fix a few simple spelling errors 557c5895c2 sha1dc: fix trivial comment spelling error aa74be316a Fix spelling errors in test commands 96c0caf5e3 Fix spelling errors in messages shown to users 4dc8b1c114 Fix spelling errors in names of tests 7a40cf1553 Fix spelling errors in comments of testcases 15beaaa3d1 Fix spelling errors in code comments a807200f67 userdiff: add Elixir to supported userdiff languages 461caf3e8a git-shortlog.txt: include commit limiting options 6462d5eb9a fetch: remove fetch_if_missing=0 46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion 99b2ba35f5 t0028: eliminate non-standard usage of printf add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` 14c4776d75 t: fix typo in test descriptions 270de6acbe t6024: modernize style 77363a51fb name-hash.c: remove duplicate word in comment c92faa4d22 hashmap: fix documentation misuses of -> versus . a6d39f2efb git-filter-branch.txt: correct argument name typo 4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators 8915297925 Fix spelling errors in documentation outside of Documentation/ 031fd4b93b Documentation: fix a bunch of typos, both old and new dd0b61f577 fsmonitor: fix watchman integration 5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare() 7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph c14e6e7903 fetch: add the command-line option `--write-commit-graph` da72936f54 Git 2.24 1d34d425d4 Merge branch 'bc/doc-use-docbook-5' dac1d83c91 Merge branch 'ds/commit-graph-on-fetch' c32ca691c2 Merge branch 'jt/delay-fetch-if-missing' ab6b50e4c8 Merge https://github.com/prati0100/git-gui 93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2 fe28ad8520 rebase: add --reset-author-date 08187b4cba rebase -i: support --ignore-date 0185c683c9 sequencer: rename amend_author to author_to_rename cbd8db17ac rebase -i: support --committer-date-is-author-date c068bcc59b sequencer: allow callers of read_author_script() to ignore fields ba51d2fb24 rebase -i: add --ignore-whitespace flag 3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower 3ada78de3f myfirstcontrib: add dependency installation step 4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt 4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly 8dfb04ae96 update-index: optionally leave skip-worktree entries alone 116d1fa6c6 vreportf(): avoid relying on stdio buffering efd5444238 RelNotes/2.24.0: fix self-contradictory note 391c7e40b5 fetch.c: fix typo in a warning message 55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template 849e43680d RelNotes/2.24.0: typofix 0115e5d929 git-diff.txt: document return code of `--no-index` 798d66e35d l10n: de.po: Update German translation c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u) f21f8f5d35 Git 2.24-rc2 8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix' 0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix' f2db52c46b Merge branch 'js/mingw-needs-hiding-fix' 5b7594abdc Merge branch 'master' of github.com:vnwildman/git 034d33653a Merge branch 'next' of github.com:ChrisADR/git-po 26b061007c submodule: teach set-url subcommand 460782b7be t7519-status-fsmonitor: improve comments d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses 4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config 1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694) f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0 762d5b4f46 help: add gitsubmodules to the list of guides 76a53d640f git_path(): handle `.lock` files correctly 3ce47211a6 t1400: wrap setup code in test case 44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string 6c02042139 clone: rename static function `dir_exists()`. 8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command 77200e9332 l10n: es: 2.24.0 round 2 e42df36b42 Merge branch 'l10n/it/update-italian-translation' 5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2 51728480fe l10n: fr v2.24.0 rnd2 045a548698 l10n: git.pot: v2.24.0 round 2 (1 new) 468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree() c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit() 103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag() f648ee7088 fsck: rename vague "oid" local variables cc579000bf fsck: don't require an object struct in verify_headers() 7854399366 fsck: don't require an object struct for fsck_ident() b8b00f1693 fsck: drop blob struct from fsck_finish() 6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob() 38370253fd fsck: don't require an object struct for report() f59793763d fsck: only require an oid for skiplist functions 5afc4b1dc6 fsck: only provide oid/type in fsck_error callback 82ef89b318 fsck: don't require object structs for display functions 733902905d fsck: use oids rather than objects for object_name API d40bbc109b fsck_describe_object(): build on our get_object_name() primitive a59cfb3230 fsck: unify object-name code 23a173a761 fsck: require an actual buffer for non-blobs 2175a0c601 fsck: stop checking tag->tagged ec65231571 fsck: stop checking commit->parent counts 1de6007d85 fsck: stop checking commit->tree value 228c78fbd4 commit, tag: don't set parsed bit for parse failures 60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()` 8b656572ca builtin/commit-graph.c: remove subcommand-less usage string fa26d5ede6 t4048: abstract away SHA-1-specific constants cf02be8486 t4045: make hash-size independent 38ee26b2a3 t4044: update test to work with SHA-256 37ab8ebef1 t4039: abstract away SHA-1-specific constants 0370b35414 t4038: abstract away SHA-1 specific constants 0253e126a2 t4034: abstract away SHA-1-specific constants 45e2ef2b1d t4027: make hash-size independent 79b0edc1a0 t4015: abstract away SHA-1-specific constants 840624ff55 t4011: abstract away SHA-1-specific constants 32a6707267 t4010: abstract away SHA-1-specific constants 440bf91dfa t3429: remove SHA1 annotation 0b408ca2bd t1305: avoid comparing extensions 2eabd38313 rev-parse: add a --show-object-format option 52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode 45e206f0d8 t4203: use test-lib.sh definitions 2ae4944aac t6006: use test-lib.sh definitions cb99a34e23 commit-graph: fix writing first commit-graph during fetch e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug 7b4fb434b4 documentation: remove empty doc files 566a1439f6 Git 2.24-rc1 04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix' 4d6fb2beeb Merge branch 'ds/feature-macros' 5f0b6ed907 Merge branch 'js/azure-ci-osx-fix' c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs' 1b4f85285f Merge branch 'dl/submodule-set-branch' c7aadccba0 fetch: delay fetch_if_missing=0 until after config c11e9966cb repo-settings: read an int for index.version 091489d068 apply: respect merge.conflictStyle in --3way aa76ae4905 t4108: demonstrate bug in apply 95806205cd t4108: use `test_config` instead of `git config` b0069684d4 t4108: remove git command upstream of pipe fa87b81385 t4108: replace create_file with test_write_lines 7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job 6c96630cb0 config: move documentation to config.h d81542e6f3 Eleventh batch e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix' d45d771978 Merge branch 'bc/smart-http-atomic-push' 22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix' 2e215b7959 Merge branch 'sb/userdiff-dts' e3cf08361a Merge branch 'sg/progress-fix' b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix' c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc' f45f88b2e4 path.c: don't call the match function without value in trie_find() c72fc40d09 path.c: clarify two field names in 'struct common_dir' 8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file 7cb8c929d7 path.c: clarify trie_find()'s in-code comment e536b1fedf Documentation: mention more worktree-specific exceptions 680cba2c2b multi-pack-index: add [--[no-]progress] option. 64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file 8dc18f8937 midx: add progress to expire_midx_packs 840cef0c70 midx: add progress to write_midx_file efbc3aee08 midx: add MIDX_PROGRESS flag 0eb3671ed9 ci(osx): use new location of the `perforce` cask da1e295e00 t604[236]: do not run setup in separate tests 49b8133a9e merge-recursive: fix merging a subdirectory into the root directory d3eebaad5e merge-recursive: clean up get_renamed_dir_portion() 80736d7c5e doc: am --show-current-patch gives an entire e-mail message a8e2c0eadc t7419: change test_must_fail to ! for grep 19c29e538e t4014: make output-directory tests self-contained 12a4aeaad8 Merge branch 'js/azure-pipelines-msvc' 399c23c046 ci(visual-studio): actually run the tests in parallel 711cd6d15c ci(visual-studio): use strict compile flags, and optimization 370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0 cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master 907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master 13bcea8c7f l10n: fr 2.24.0 rnd 1 135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master 3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) 8da56a4848 userdiff: fix some corner cases in dts regex 86795774bb builtin/blame.c: constants into bit shift format feebd2d256 rebase: hide --preserve-merges option 0e40a73a4c Doc: Bundle file usage 78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error 12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error 2b6f6ea1bd test-progress: fix test failures on big-endian systems f757409e36 l10n: bg.po: Updated Bulgarian translation (4693) 176f5adfdb completion: clarify installation instruction for zsh d966095db0 Git 2.24-rc0 90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array' 3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth' d0258d0944 Merge branch 'rs/http-push-simplify' bb52def6da Merge branch 'jj/stash-reset-only-toplevel' f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs' e5fca6b573 Merge branch 'bb/compat-util-comment-fix' 43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup' 07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely' 2d74d28ee0 Merge branch 'dl/compat-cleanup' 9b83a94829 Merge branch 'ta/t1308-typofix' 376012c919 Merge branch 'js/doc-stash-save' 10da030ab7 grep: avoid leak of chartables in PCRE2 513f2b0bbd grep: make PCRE2 aware of custom allocator 57d4660468 grep: make PCRE1 aware of custom allocator d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand 8af69cf3e2 t3301: test diagnose messages for too few/many paramters 6f1194246a remote-curl: pass on atomic capability to remote side bbb13e8188 graph: fix coloring of octopus dashes 92beecc136 graph: flatten edges that fuse with their right neighbor 479db18bc0 graph: smooth appearance of collapsing edges on commit lines 0195285b95 graph: rename `new_mapping` to `old_mapping` d62893ecc1 graph: commit and post-merge lines for left-skewed merges 0f0f389f12 graph: tidy up display of left-skewed merges 458152cce1 graph: example of graph output that can be simplified ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state 46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()` a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()` 9157a2a032 graph: reuse `find_new_column_by_commit()` 210179a20d graph: handle line padding in `graph_next_line()` fbccf255f9 graph: automatically track display width of graph lines 5374a290aa fetch-pack: write fetched refs to .promisor 4627bc777e sequencer: run post-commit hook 49697cb721 move run_commit_hook() to libgit and use it there 12bb7a540a sequencer.h fix placement of #endif 6a619ca03c t3404: remove uneeded calls to set_fake_editor b2dbacbddf t3404: set $EDITOR in subshell 88a92b6c73 t3404: remove unnecessary subshell bf8e65b30b format-patch: teach --cover-from-description option a92331df18 format-patch: use enum variables 46273df7bf format-patch: replace erroneous and condition 3b3c79f6c9 diff-highlight: fix a whitespace nit 108b97dc37 Ninth batch cbe8cdd3a0 Merge branch 'jk/coc' 3b9ec27919 Merge branch 'js/trace2-fetch-push' c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch' 1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup' eb3de5b823 Merge branch 'js/xdiffi-comment-updates' 4e8371ec26 Merge branch 'dl/t0000-skip-test-test' b6d712fa4e Merge branch 'tg/range-diff-output-update' 77458870a5 Merge branch 'gs/sq-quote-buf-pretty' 5efabc7ed9 Merge branch 'ew/hashmap' d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files' 6ed610b968 Merge branch 'am/t0028-utf16-tests' 5b900fb812 Merge branch 'dl/octopus-graph-bug' 16d9d7184b Merge branch 'en/fast-imexport-nested-tags' 6d5291be45 Merge branch 'js/azure-pipelines-msvc' ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd' d96e31e390 Merge branch 'js/fetch-jobs' 280bd44551 Merge branch 'en/merge-recursive-cleanup' 062a309d36 remote-curl: use argv_array in parse_push() a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes 5cc6a4be11 http-push: simplify deleting a list item 556895d0c8 stash: avoid recursive hard reset on submodules b524f6b399 Merge branch 'ka/japanese-translation' f6f3824b4e git-gui: improve Japanese translation 61f4b407d3 Merge branch 'py/readme' 1e6880fd06 git-gui: add a readme edefc31873 format-patch: create leading components of output directory 68b69211b2 git-compat-util: fix documentation syntax fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth() e0479fa073 documentation: add tutorial for object walking 3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed 4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target 9cad1c4488 pthread.h: manually align parameter lists 8c1cfd58e3 t1308-config-set: fix a test that has a typo 57d8f4b4c7 doc(stash): clarify the description of `save` 08da6496b6 Eighth batch 07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup' f0d407e6ae Merge branch 'kt/add-i-progress' 66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree' a4c5d9f66e Merge branch 'rs/dedup-includes' 159cdabd87 Merge branch 'js/range-diff-noprefix' 93424f1f7d Merge branch 'cb/pcre1-cleanup' a73f91774c Merge branch 'ab/pcre-jit-fixes' 4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword' 020011f2cb Merge branch 'tk/git-svn-trim-author-name' 676278f8ea Merge branch 'bc/object-id-part17' aafb75452b Merge branch 'en/clean-nested-with-ignored' 3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails 5cdf2301d4 add a Code of Conduct document 70bf0b755a Seventh batch 9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat' 2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary' d17f54947d Merge branch 'rs/convert-fix-utf-without-dash' 82c80f98e6 Merge branch 'py/git-gui-has-maintainer' 6e12570822 Merge branch 'ah/cleanups' 772cad0afb Merge branch 'js/diff-rename-force-stable-sort' 424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path' 678a9ca629 Merge branch 'as/shallow-slab-use-fix' 0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix' 042a54d251 Merge branch 'am/visual-studio-config-fix' 03d3b1297c xdiffi: fix typos and touch up comments b05b40930e t0000: cover GIT_SKIP_TESTS blindspots d8bc1a518a send-pack: never fetch when checking exclusions 756fb0dedb t4014: treat rev-list output as the expected value 2b6a9b13ca range-diff: don't segfault with mode-only changes 360c7ba330 transport: push codepath can take arbitrary repository ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments b657047719 merge-recursive: fix the fix to the diff3 common ancestor label b744c3af07 Sixth batch 417056578a Merge branch 'bw/submodule-helper-usage-fix' 9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check' 1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a' 59b19bcd9f Merge branch 'cc/multi-promisor' 1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' 5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort' eb35c18e42 Merge branch 'sg/travis-help-debug' cabb145fe3 Merge branch 'rs/alias-use-copy-array' 56c7ab0f4e Merge branch 'sg/t-helper-gitignore' e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang' 583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules' 337e3f2b49 Merge branch 'rs/nth-switch-code-simplification' 8f53fe1733 Merge branch 'hb/hg-to-git-py3' ef93bfbd45 Merge branch 'sg/progress-fix' 980351d1ac Merge branch 'js/doc-patch-text' 80693e3f09 Merge branch 'tb/commit-graph-harden' ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge' 3f84633563 Merge branch 'dl/cocci-everywhere' caf150ce7d Merge branch 'gs/commit-graph-progress' 1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim' 1398171378 Merge branch 'rs/commit-graph-use-list-count' 773521df26 Merge branch 'rs/nth-parent-parse' 7f17913161 Merge branch 'dl/submodule-set-branch' cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix' bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees' 098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack' 37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc' e392382f95 Merge branch 'dl/complete-rebase-and-archive' cda8faa37e Merge branch 'jk/commit-graph-cleanup' 36d2fca82b Merge branch 'ss/get-time-cleanup' ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude' ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob' ba2d451122 Merge branch 'tg/stash-refresh-index' e2b5038d87 hashmap_entry: remove first member requirement from docs 404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry 23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators c8e424c9c9 hashmap: introduce hashmap_free_entries 8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry * 87571c3f71 hashmap: use *_entry APIs for iteration 939af16eac hashmap_cmp_fn takes hashmap_entry params f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *" f0e63c4113 hashmap: use *_entry APIs to wrap container_of 6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *" 973d5eea74 introduce container_of macro 26b455f21e hashmap_put takes "struct hashmap_entry *" 28ee794128 hashmap_remove takes "const struct hashmap_entry *" b6c5241606 hashmap_get takes "const struct hashmap_entry *" b94e5c1df6 hashmap_add takes "struct hashmap_entry *" f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *" d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *" d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry 12878c8351 coccicheck: detect hashmap_entry.hash assignment e010a41216 diff: use hashmap_entry_init on moved_entry.ent f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo" de5abb5f7a git-p4: auto-delete named temporary file c90b652afd Fifth batch f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1' b0f8aed48f Merge branch 'ma/user-manual-markup-update' faf5576a8d Merge branch 'bc/doc-use-docbook-5' 314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes' 70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo' 847650798b Merge branch 'am/mailmap-andrey-mazo' 1a155f2e66 Merge branch 'jc/git-gui-has-maintainer' 1bcef51204 t/oid-info: add empty tree and empty blob values ecde49bb8a t/oid-info: allow looking up hash algorithm name 11a3d3aadd git-rev-list.txt: prune options in synopsis 7d2f003ee4 Documentation: update the location of the git-gui repo b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding() 46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines b35304bf95 ci: really use shallow clones on Azure Pipelines ab7d854aba tests: let --immediate and --write-junit-xml play well together be5d88e112 test-tool run-command: learn to run (parts of) the testsuite 5d65ad17a9 vcxproj: include more generated files 030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built 61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable() e4347c9434 msvc: handle DEVELOPER=1 ed712ef8d5 msvc: ignore some libraries when linking 5b8f9e2417 compat/win32/path-utils.h: add #include guards 41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning c097b95a26 msvc: avoid using minus operator on unsigned types dfd557c978 stash apply: report status correctly even in a worktree's subdirectory d54dea77db fetch: let --jobs=<n> parallelize --multiple, too 87db61a436 trace2: write discard message to sentinel files 83e57b04e6 trace2: discard new traces if target directory has too many files 11c21f22de t4214: demonstrate octopus graph coloring failure 25eb905e14 t4214: explicitly list tags in log 63be8c8dd7 t4214: generate expect in their own test cases a7a5590c6e t4214: use test_merge 94ba151300 test-lib: let test_merge() perform octopus merges 22541013d0 docs: clarify trace2 version invariants 3d4548e7e2 docs: mention trace2 target-dir mode in git-config 2fe44394c8 treewide: remove duplicate #include directives dbcd970c27 push: do not pretend to return `int` from `die_push_simple()` 941790d7de fast-export: handle nested tags 8d7d33c1ce t9350: add tests for tags of things other than a commit a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags 208d69246e fast-export: add support for --import-marks-if-exists b8f50e5b60 fast-import: add support for new 'alias' command f73b2aba05 fast-import: allow tags to be identified by mark labels 3164e6bd24 fast-import: fix handling of deleted tags 8085050ab4 add -i: show progress counter in the prompt 69fdb922ad Merge branch 'bw/diff3-conflict-style' b436825b9b git-gui: support for diff3 conflict style 937b76ed49 range-diff: internally force `diff.noprefix=true` 411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job 25e4b8099c push: add trace2 instrumentation 5fc31180d8 fetch: add trace2 instrumentation 53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value c3b57dc2a0 git-gui: use existing interface to query a path's attribute 45ab460d4a Merge branch 'js/git-bash-if-available' 0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command 71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only) 54a80a9ad8 wrapper: use a loop instead of repetitive statements baed6bbb5b diffcore-break: use a goto instead of a redundant if statement 8da02ce62a commit-graph: remove a duplicate assignment ddb3c856f3 shallow.c: don't free unallocated slabs 8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits 65904b8b2b promisor-remote: skip move_to_tail when no-op 2049b8dc65 diffcore_rename(): use a stable sort 97fff61012 Move git_sort(), a stable sort, into into libgit.a 69f272b922 dir: special case check for the possibility that pathspec is NULL 6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available bc12974a89 Fourth batch 5a5350940b Merge branch 'ds/commit-graph-on-fetch' 974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch' 9755f70fe6 Merge branch 'ds/include-exclude' 93fc8760e7 Merge branch 'jh/trace2-pretty-output' 640f9cd599 Merge branch 'dl/rebase-i-keep-base' 026428c35e Merge branch 'sg/clean-nested-repo-with-ignored' 21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip' d693345518 Merge branch 'dl/use-sq-from-test-lib' d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes' 2be6ccc01a Merge branch 'sg/git-test-boolean' cf861cd7a0 Merge branch 'rs/get-tagged-oid' 91243b019d Merge branch 'en/filter-branch-deprecation' 9bc67b6658 Merge branch 'en/merge-options-ff-and-friends' fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden' cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option' 8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return' 3ff6af7753 Merge branch 'nd/switch-and-restore' aadac067aa Merge branch 'tb/file-url-to-unc-path' b57a88a5f1 Merge branch 'js/gitdir-at-unc-root' 6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path' 430439536b Merge branch 'rs/parse-tree-indirect' 991fd97b9a Merge branch 'jk/fast-import-history-bugfix' 74a39b9bcc Merge branch 'mh/notes-duplicate-entries' 37801f0665 Merge branch 'tb/banned-vsprintf-namefix' 21ce0b48f3 Merge branch 'mh/release-commit-memory-fix' f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup' bf6136cab8 Merge branch 'rs/strbuf-detach' a2e22bb3ad Merge branch 'rs/trace2-dst-warning' 1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup' 0281733483 Merge branch 'bc/hash-independent-tests-part-5' f06fb376ed Merge branch 'jc/test-cleanup' 00bb74453d Merge branch 'dl/compat-cleanup' 59438be06c Merge branch 'js/visual-studio' cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone' af2abd870b fast-export: fix exporting a tag and nothing else c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit fd5b820d9c user-manual.txt: change header notation e79b34533a user-manual.txt: add missing section label b503a2d515 Makefile: emulate compile in $(HCO) target better af26e2a9d2 pack-bitmap.h: remove magic number b06fdead04 promisor-remote.h: include missing header 97b989ee3a apply.h: include missing header 4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name d928a8388a t0028: add more tests 0b63fd6965 t0028: fix test for UTF-16-LE-BOM fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration 2e09c01232 name-rev: avoid cutoff timestamp underflow 8464f94aeb promisor-remote.h: drop extern from function declaration 75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp 24c681794f doc: MyFirstContribution: fix cmd placement instructions c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode 60c60b627e Merge branch 'py/git-git-extra-stuff' faf420e05a treewide: correct several "up-to-date" to "up to date" b71c6c3b64 Fix build with core.autocrlf=true 16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff 26e3d1cbea .mailmap: update email address of Andrey Mazo 27ea41c0b4 t/helper: ignore only executable files 7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias() 83e3ad3b12 merge-recursive: symlink's descendants not in way 34933d0eff stash: make sure to write refreshed cache e080b34540 merge: use refresh_and_write_cache 22184497a3 factor out refresh_and_write_cache function 7371612255 commit-graph: add --[no-]progress to write and verify 47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW 253bfe49bd SubmittingPatches: git-gui has a new maintainer d17ae00c97 hg-to-git: make it compatible with both python3 and python2 4c86140027 Third batch f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http' 627b826834 Merge branch 'md/list-objects-filter-combo' b9ac6c59b8 Merge branch 'cc/multi-promisor' de67293e74 Merge branch 'sg/line-log-tree-diff-optim' 95486229e3 Merge branch 'sg/complete-configuration-variables' f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook' a2e524ecf3 Merge branch 'cb/curl-use-xmalloc' 128666753b Merge branch 'jk/drop-release-pack-memory' 917a319ea5 Merge branch 'js/rebase-r-strategy' 7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui 4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout() 0d4304c124 doc: fix reference to --ignore-submodules af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py 8a3a6817e2 Merge gitk to pick up emergency build fix 2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po 9027af58e2 Makefile: run coccicheck on more source files 43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES) 5dedf7de53 Makefile: define THIRD_PARTY_SOURCES 902b90cf42 clean: fix theoretical path corruption ca8b5390db clean: rewrap overly long line 09487f2cba clean: avoid removing untracked files in a nested git repository e86bbcf987 clean: disambiguate the definition of -d 3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run 29b577b960 dir: add commentary explaining match_pathspec_item's return value 89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case 404ebceda0 dir: also check directories for matching pathspecs a5e916c745 dir: fix off-by-one error in match_pathspec_item bbbb6b0b89 dir: fix typo in comment 7541cc5302 t7300: add testcases showing failure to clean specified pathspecs 0eb7c37a8a diff, log doc: small grammer, format, and language fixes 6fae6bd518 diff, log doc: say "patch text" instead of "patches" 2bb74b53a4 Test the progress display bbf47568ad Revert "progress: use term_clear_line()" cf6a2d2557 Makefile: strip leading ./ in $(LIB_H) b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup 689a146c91 commit-graph: use commit_list_count() 59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N" a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N" a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base" cf34337f98 list-objects-filter: give a more specific error sparse parsing error 4c96a77594 list-objects-filter: delay parsing of sparse oid 72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter 83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer 7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>` 226daba280 Doc/Makefile: give mansource/-version/-manual attributes 40e747e89d git-submodule.txt: fix AsciiDoc formatting error f6461b82b9 Documentation: fix build with Asciidoctor 2 3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk f7a8834ba4 Merge branch 'bp/amend-toggle-bind' ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit" 9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog beffae768a gitk: Add Chinese (zh_CN) translation 56d9cbe68b packfile: expose get_delta_base() bab28d9f97 builtin/pack-objects: report reused packfile objects 6c8ec8c30a Merge branch 'bw/commit-scrollbuffer' acfa495519 Merge branch 'bw/amend-checkbutton' da08d559b7 git-gui: add horizontal scrollbar to commit buffer ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton aeeb978ba6 completion: teach archive to use __gitcomp_builtin 2b9bd488ae completion: teach rebase to use __gitcomp_builtin d49dffde9a completion: add missing completions for log, diff, show 6abada1880 upload-pack: disable commit graph more gently for shallow traversal fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time 72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set 4fd39c76e6 doc: minor formatting fix 29f4332e66 Quit passing 'now' to date code c77abf0460 Merge branch 'py/revert-hunks-lines' 5a2bb62180 Merge branch 'bp/widget-focus-hotkeys' e07446ed5f git-gui: add hotkeys to set widget focus f981ec18cf cache-tree: do not lazy-fetch tentative tree f1d4a28250 Second batch c8ada15456 Merge branch 'bc/reread-attributes-during-rebase' 8f3ba423e7 Merge branch 'tg/t0021-racefix' a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email' d49c2c3466 Merge branch 'sb/userdiff-dts' 2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe' 4c49dd042d Merge branch 'nd/diff-parseopt' d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix' 8ce8a63b46 Merge branch 'ds/midx-expire-repack' 9437394661 Merge branch 'cb/fetch-set-upstream' af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix' fa9e7934c7 Merge branch 'bm/repository-layout-typofix' d1a251a1fa Merge branch 'en/checkout-mismerge-fix' e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental' f4f8dfe127 Merge branch 'ds/feature-macros' 4a12f89865 Merge branch 'jk/eoo' b4a1eec332 Merge branch 'jk/repo-init-cleanup' 70336bd50a Merge branch 'py/git-gui-do-quit' ad7c543e3b grep: skip UTF8 checks explicitly 0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration() b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration 4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor b7e1ba5649 git-merge-index.txt: wrap shell listing in "----" 38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----" 5371813768 git-ls-remote.txt: wrap shell listing in "----" 1925fe0c8a Documentation: wrap config listings in "----" 922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor 2017956a19 Documentation: wrap blocks with "--" dd2e50a84e commit-graph: turn off save_commit_buffer 67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits 806278dead commit-graph.c: handle corrupt/missing trees 16749b8dd2 commit-graph.c: handle commit parsing errors 23424ea759 t/t5318: introduce failing 'git commit-graph write' tests bf1e28e0ad builtin/rebase.c: Remove pointless message d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing bd482d6e33 t: use common $SQ variable 3a37876b5d pack-objects: drop packlist index_pos optimization 7e6b96c73b test-read-cache: drop namelen variable e4b369069e diff-delta: set size out-parameter to 0 for NULL delta 7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint f1cbd033e2 pack-objects: use object_id in packlist_alloc() 0dfed92dfd git-am: handle missing "author" when parsing commit 3960290675 ci: restore running httpd tests 6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests c77722b3ea use get_tagged_oid() dad3f0607b tag: factor out get_tagged_oid() 468ce99b77 unpack-trees: rename 'is_excluded_from_list()' 65edd96aec treewide: rename 'exclude' methods to 'pattern' 4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_' caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list' ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern' 483e861111 t9902: use a non-deprecated command for testing 9df53c5de6 Recommend git-filter-repo instead of git-filter-branch 7b6ad97939 t6006: simplify, fix, and optimize empty message test 50094ca45f config/format.txt: specify default value of format.coverLetter c1a6f21cd4 Doc: add more detail for git-format-patch 854b5cb46a t4014: stop losing return codes of git commands dd2b6b6860 t4014: remove confusing pipe in check_threading() 6bd26f58ea t4014: use test_line_count() where possible c6ec6dadba t4014: let sed open its own files f2e2fa8f60 t4014: drop redirections to /dev/null 460609cbd5 t4014: use indentable here-docs 92014b69bb t4014: remove spaces after redirect operators 0ab74e979c t4014: use sq for test case names cb46c40662 t4014: move closing sq onto its own line b562a54c01 t4014: s/expected/expect/ e770fbfeff t3005: remove unused variable da280f5f1a t: use LF variable defined in the test harness 7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch 552fc5016f mingw: apply array.cocci rule 476998d05b t3427: accelerate this test by using fast-export and fast-import aac6ff7b5b .gitignore: stop ignoring `.manifest` files 2c65d90f75 am: reload .gitattributes after patching it 1577dc0f7c tree: simplify parse_tree_indirect() 50f26bd035 fetch: add fetch.writeCommitGraph config setting 8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set 27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options 0a8bc7068f clarify documentation for remote helpers 80e3658647 help: make help_unknown_ref() NORETURN 313677627a checkout: add simple check for 'git checkout -b' 3441de5b9c gitk: Make web links clickable a4fa2f0a4c git-gui: allow undoing last revert 414d924beb rebase: teach rebase --keep-base 6330209d7d rebase tests: test linear branch topology 4effc5bc96 rebase: fast-forward --fork-point in more cases c0efb4c1dd rebase: fast-forward --onto in more cases 2b318aa6c3 rebase: refactor can_fast_forward into goto tower c9efc21683 t3432: test for --no-ff's interaction with fast-forward 1ebec8dfc1 fast-import: duplicate into history rather than passing ownership 9756082b3c fast-import: duplicate parsed encoding string 86ae43da6a status: mention --skip for revert and cherry-pick b1b16bba96 completion: add --skip for cherry-pick and revert deaa65a754 completion: merge options for cherry-pick and revert 4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests 793ac7e309 t3432: test rebase fast-forward behavior 359ecebc34 t3431: add rebase --fork-point tests 502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage ff61681b46 grep: refactor and simplify PCRE1 support 8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1 1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning() fd99c2dd9b grep: use return value of strbuf_detach() 82f51af345 log-tree: always use return value of strbuf_detach() 7e92756751 http: don't leak urlmatch_config.vars 9784f97321 commit: free the right buffer in release_commit_memory ce17feb1b3 path: add a function to check for path suffix 60d198d022 banned.h: fix vsprintf()'s ban message 60fe477a0b notes: avoid potential use-after-free during insertion 779ad6641b notes: avoid leaking duplicate entries 4e1a641ee3 mingw: fix launching of externals from Unicode paths 5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly e2683d51d9 Fix .git/ discovery at the root of UNC shares d17f2124a7 setup_git_directory(): handle UNC paths correctly ebb8d2c90f mingw: support UNC in git clone file://server/share/repo 0c37c41d13 t4009: make hash size independent c1f3dfcc23 t4002: make hash independent 8cc5ff83c3 t4000: make hash size independent c784815073 t3903: abstract away SHA-1-specific constants 2ccdfb1c78 git-gui: return early when patch fails to apply 62bd99934b git-gui: allow reverting selected hunk 5f0a516de9 git-gui: allow reverting selected lines fddf2ebe38 transport: teach all vtables to allow fetch first ac3fda82bf transport-helper: skip ls-refs if unnecessary 745f681289 First batch after Git 2.23 d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg' 22e86e85cb Merge branch 'en/fast-import-merge-doc' 9c7573581c Merge branch 'jk/perf-no-dups' 4336fdb2ef Merge branch 'rs/nedalloc-fixlets' 8ae7a46c4d Merge branch 'sg/show-failed-test-names' 6ba06b582b Merge branch 'sg/commit-graph-validate' 072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix' 207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix' 77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests' 1b01cdbf2e Merge branch 'jk/tree-walk-overflow' 8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix' 307179732d Merge branch 'mt/grep-submodules-working-tree' 58166c2e9d t0021: make sure clean filter runs 8b3f33ef11 ref-filter: initialize empty name or email fields 3c81760bc6 userdiff: add a builtin pattern for dts files fe49814409 t4014: drop unnecessary blank lines from test cases a2bb801f6a line-log: avoid unnecessary full tree diffs eef5204190 line-log: extract pathspec parsing from line ranges into a helper function a63694f523 diff: skip GITLINK when lazy fetching missing objs 7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe 19800bdc3f parseopt: move definition of enum parse_opt_result up 415b770b88 packfile.h: drop extern from function declaration acb49d1cc8 t3800: make hash-size independent ca6ba94200 t3600: make hash size independent 19ce5496c2 t3506: make hash independent 9a6738c061 t3430: avoid hard-coded object IDs 4dd1b5f90f t3404: abstract away SHA-1-specific constants b99bfc7a6c t3306: abstract away SHA-1-specific constants e3e9d02e35 t3305: make hash size independent b408cf8cf6 t3301: abstract away SHA-1-specific constants b561edd213 t3206: abstract away hash size constants a5f61c7d13 t3201: abstract away SHA-1-specific constants 1c24a54ea4 repository-layout.txt: correct pluralization of 'object' b0a3186140 sequencer: simplify root commit creation a47ba3c777 rebase -i: check for updated todo after squash and reword 450efe2d53 rebase -i: always update HEAD before rewording c581e4a749 grep: under --debug, show whether PCRE JIT is enabled aaa95dfa05 midx: switch to using the_hash_algo be8e172e9f builtin/show-index: replace sha1_to_hex 3f34d70d40 rerere: replace sha1_to_hex fc06be3b7f builtin/receive-pack: replace sha1_to_hex 69fa337060 builtin/index-pack: replace sha1_to_hex 3a4d7aa5ae packfile: replace sha1_to_hex e0cb7cdb89 wt-status: convert struct wt_status to object_id 8d4d86b0f0 cache: remove null_sha1 f6ca67d673 builtin/worktree: switch null_sha1 to null_oid dd336a5511 builtin/repack: write object IDs of the proper length 894c0f66bb pack-write: use hash_to_hex when writing checksums 4439c7a360 sequencer: convert to use the_hash_algo 95518faac1 bisect: switch to using the_hash_algo e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo fe9fec45f6 config: use the_hash_algo in abbrev comparison 976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo 703d2d4193 bundle: switch to use the_hash_algo 9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo 7962e046ff show-index: switch hard-coded constants to the_hash_algo fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ 7e0d029f18 builtin/rev-parse: switch to use the_hash_algo 319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo f6af19a9ad fetch-pack: use parse_oid_hex 36261e42ec patch-id: convert to use the_hash_algo 28ba1830d0 builtin/replace: make hash size independent 24bc1a1292 pull, fetch: add --set-upstream option 71d41ff651 archive-tar: turn length miscalculation warning into BUG 17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header() 82a46af13e archive-tar: fix pax extended header length calculation 4060c1990a archive-tar: report wrong pax extended header length 4615a8cb5b merge-recursive: alphabetize include list 45ef16f77a merge-recursive: add sanity checks for relevant merge_options f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* 5bf7e5779e merge-recursive: split internal fields into a separate struct e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output a779fb829b merge-recursive: comment and reorder the merge_options fields 8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options 7c0a6c8e47 merge-recursive: move some definitions around to clean up the header c749ab1da8 merge-recursive: rename merge_options argument to opt in header bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list 4d7101e25c merge-recursive: fix some overly long lines 724dd767b2 cache-tree: share code between functions writing an index as a tree 345480d1ed merge-recursive: don't force external callers to do our logging b4db8a2b76 merge-recursive: remove useless parameter in merge_trees() 98a1d3d888 merge-recursive: exit early if index != head 9822175d2b Ensure index matches head before invoking merge machinery, round N 10f751c06b merge-recursive: remove another implicit dependency on the_repository f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks 8e01251694 merge-recursive: introduce an enum for detect_directory_renames values 743474cbfa merge-recursive: provide a better label for diff3 common ancestor 51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u) 5bace62582 l10n: Update Catalan translation 139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees() 65c01c6442 checkout: provide better conflict hunk description with detached HEAD d8523ca1b9 merge-recursive: be consistent with assert acb7da05ac checkout: remove duplicate code 93b980e58f http: use xmalloc with cURL 64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental aaf633c2ad repo-settings: create feature.experimental setting c6cc4c5afd repo-settings: create feature.manyFiles setting ad0fb65999 repo-settings: parse core.untrackedCache 31b1de6a09 commit-graph: turn on commit-graph by default b068d9a250 t6501: use 'git gc' in quiet mode 7211b9e753 repo-settings: consolidate some config settings 507e5470a0 worktree remove: clarify error message on dirty worktree 5af9d5f6c8 completion: complete config variables and values for 'git clone --config=' 88cd790d6a completion: complete config variables names and values for 'git clone -c' dd33472831 completion: complete values of configuration variables after 'git -c var=' e1e00089da completion: complete configuration sections and variable names for 'git -c' 42d0efec59 completion: split _git_config() d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp() 2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names d9438873c4 completion: deduplicate configuration sections 7a09a8f093 completion: add tests for 'git config' completion 840d7e5b3c completion: complete more values of more 'color.*' configuration variables 08a12175d8 completion: fix a typo in a comment 9827d4c185 packfile: drop release_pack_memory() d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed 362f8b280c t/perf: rename duplicate-numbered test script 742ed63345 trace2: cleanup whitespace in perf format e34430556c trace2: cleanup whitespace in normal format c2b890aca5 quote: add sq_append_quote_argv_pretty() ad43e37839 trace2: trim trailing whitespace in normal format error message 04f10d332f trace2: remove dead code in maybe_add_string_va() da4589ce7e trace2: trim whitespace in region messages in perf target format 0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit 5440eb0ea2 git-gui: call do_quit before destroying the main window bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook 6098817fd7 git-merge: honor pre-merge-commit hook a1f3dd7eb3 merge: do no-verify like commit f78f6c7e0c t7503: verify proper hook execution 70597e8386 nedmalloc: avoid compiler warning about unused value c9b9c09dae nedmalloc: do assignments only after the declaration section 22932d9169 config: stop checking whether the_repository is NULL 5732f2b1ef common-main: delay trace2 initialization 58ebccb478 t1309: use short branch name in includeIf.onbranch test 67feca3b1c gitcli: document --end-of-options 51b4594b40 parse-options: allow --end-of-options as a synonym for "--" 19e8789b23 revision: allow --end-of-options to end option parsing ffe1afe67c tests: show the test name and number at the start of verbose output 96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests 7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits' 39d8831856 commit-graph: turn a group of write-related macro flags into an enum 9916073be5 t5318-commit-graph: use 'test_expect_code' 620c09e1b6 restore: add test for deleted ita files ecd72042de checkout.c: unstage empty deleted ita files a613d4f817 pack-refs: always refresh after taking the lock file decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd' 371df1bea9 trace2: cleanup column alignment in perf target format 5aa02f9868 tree-walk: harden make_traverse_path() length computations c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path() b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len() 37806080d7 tree-walk: use size_t consistently 7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh' 12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh' 9055384710 tree-walk: drop oid from traverse_info 947208b725 setup_traverse_info(): stop copying oid e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` a63f990d92 t3418: test `rebase -r` with merge strategies 5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges` e145d99347 rebase -r: support merge strategies other than `recursive` 4e6023b13a t3427: fix another incorrect assumption f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced a9c71073da t3427: fix erroneous assumption b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case c248d32cdb t3427: simplify the `setup` test case significantly 8c1e24048a t3427: add a clarifying comment 5efed0ecf9 rebase: fold git-rebase--common into the -p backend 68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone 2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive` 6180b20239 t3400: stop referring to the scripted rebase d5b581f228 Drop unused git-rebase--am.sh 814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation 6a289d45c0 grep: fix worktree case in submodules 870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching 8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data 09872f6418 grep: create a "is_fixed" member in "grep_pat" 8a35b540a9 grep: consistently use "p->fixed" in compile_regexp() 685668faaa grep: stop using a custom JIT stack with PCRE v1 34489239d0 grep: stop "using" a custom JIT stack with PCRE v2 04bef50c01 grep: remove overly paranoid BUG(...) code b65abcafc7 grep: use PCRE v2 for optimized fixed-string search 48de2a768c grep: remove the kwset optimization 45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern> 25754125ce grep: make the behavior for NUL-byte in patterns sane d316af059d grep tests: move binary pattern tests into their own file 471dac5d2c grep tests: move "grep binary" alongside the rest f463beb805 grep: inline the return value of a function call used only once b14cf112e2 t4210: skip more command-line encoding tests on MinGW 44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>" 4e2443b181 log tests: test regex backends in "--encode=<enc>" tests 90d21f9ebf list-objects-filter-options: make parser void 5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW 489fc9ee71 list-objects-filter-options: allow mult. --filter c2694952e3 strbuf: give URL-encoding API a char predicate fn cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list f56f764279 list-objects-filter-options: move error check up e987df5fe6 list-objects-filter: implement composite filters 842b00516a list-objects-filter-options: always supply *errbuf 7a7c7f4a6d list-objects-filter: put omits set in filter struct 9430147ca0 list-objects-filter: encapsulate filter components 4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c 60b7a92d84 Move repository_format_partial_clone to promisor-remote.c db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} 75de085211 remote: add promisor and partial clone config to the doc 7e154badc0 partial-clone: add multiple remotes in the doc 9a4c507886 t0410: test fetching from many promisor remotes 5e46139376 builtin/fetch: remove unique promisor remote limitation fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote() faf2abf496 promisor-remote: use repository_format_partial_clone 9cfebc1f3b promisor-remote: add promisor_remote_reinit() 9e27beaa23 promisor-remote: implement promisor_remote_get_direct() 48de315817 Add initial support for many promisor remotes 2e860675b6 fetch-object: make functions return an error code c59c7c879e t0410: remove pipes after git commands git-subtree-dir: third_party/git git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
#: commit-graph.c:1237
msgid "Finding commits for commit graph among packed objects"
msgstr "S'estan cercant les comissions pel graf de comissions entre els objectes empaquetats"
#: commit-graph.c:1252
msgid "Counting distinct commits in commit graph"
msgstr "S'estant comptant les comissions diferents al graf de comissions"
#: commit-graph.c:1283
msgid "Finding extra edges in commit graph"
msgstr "S'estan cercant les vores addicionals al graf de comissions"
#: commit-graph.c:1331
msgid "failed to write correct number of base graph ids"
msgstr "s'ha produït un error en escriure el nombre correcte d'ids base del graf"
#: commit-graph.c:1364 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251
#, c-format
msgid "unable to create '%s'"
msgstr "no s'ha pogut crear «%s»"
#: commit-graph.c:1436
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "S'està escrivint el graf de comissions en %d pas"
msgstr[1] "S'està escrivint el graf de comissions en %d passos"
#: commit-graph.c:1477
msgid "unable to open commit-graph chain file"
msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions"
#: commit-graph.c:1489
msgid "failed to rename base commit-graph file"
msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions"
#: commit-graph.c:1509
msgid "failed to rename temporary commit-graph file"
msgstr "no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
#: commit-graph.c:1620
msgid "Scanning merged commits"
msgstr "S'estan escanejant les comissions fusionades"
#: commit-graph.c:1631
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr "id de comissió duplicat %s no esperat"
#: commit-graph.c:1656
msgid "Merging commit-graph"
msgstr "S'està fusionant el graf de comissions"
#: commit-graph.c:1842
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "el format del graf de comissions no pot escriure %d comissions"
#: commit-graph.c:1853
msgid "too many commits to write graph"
msgstr "massa comissions per escriure un graf"
#: commit-graph.c:1943
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"el fitxer commit-graph (graf de comissions) té una suma de verificació "
"incorrecta i probablement és corrupte"
#: commit-graph.c:1953
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
#: commit-graph.c:1963 commit-graph.c:1978
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
#: commit-graph.c:1970
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "s'ha produït un error en analitzar la comissió %s del graf de comissions"
#: commit-graph.c:1987
msgid "Verifying commits in commit graph"
msgstr "S'estan verificant les comissions al graf de comissions"
#: commit-graph.c:2000
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
#: commit-graph.c:2007
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
#: commit-graph.c:2017
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
#: commit-graph.c:2026
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
#: commit-graph.c:2039
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
#: commit-graph.c:2044
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
#: commit-graph.c:2048
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
#: commit-graph.c:2063
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr ""
#: commit-graph.c:2069
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "memòria esgotada"
#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%s\n"
"from\n"
"\t%s\n"
"This might be due to circular includes."
msgstr ""
#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "no s'ha pogut expandir el camí d'inclusió «%s»"
#: config.c:151
msgid "relative config includes must come from files"
msgstr "les inclusions de configuració relatives han de venir de fitxers"
#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
"els condicionals d'inclusió de configuració relatius han de venir de fitxers"
#: config.c:375
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clau no conté una secció: «%s»"
#: config.c:381
#, c-format
msgid "key does not contain variable name: %s"
msgstr "la clau no conté un nom de variable: «%s»"
#: config.c:405 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "clau no vàlida: %s"
#: config.c:411
#, c-format
msgid "invalid key (newline): %s"
msgstr "clau no vàlida (línea nova): %s"
#: config.c:447 config.c:459
#, c-format
msgid "bogus config parameter: %s"
msgstr "paràmetre de configuració erroni: %s"
#: config.c:494
#, c-format
msgid "bogus format in %s"
msgstr "format erroni a %s"
#: config.c:820
#, c-format
msgid "bad config line %d in blob %s"
msgstr "línia de configuració %d errònia en el blob %s"
#: config.c:824
#, c-format
msgid "bad config line %d in file %s"
msgstr "línia de configuració %d errònia en el fitxer %s"
#: config.c:828
#, c-format
msgid "bad config line %d in standard input"
msgstr "línia de configuració %d errònia en l'entrada estàndard"
#: config.c:832
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "línia de configuració %d errònia en el blob de submòdul %s"
#: config.c:836
#, c-format
msgid "bad config line %d in command line %s"
msgstr "línia de configuració %d errònia en la línia d'ordres %s"
#: config.c:840
#, c-format
msgid "bad config line %d in %s"
msgstr "línia de configuració %d errònia en %s"
#: config.c:977
msgid "out of range"
msgstr "fora de rang"
#: config.c:977
msgid "invalid unit"
msgstr "unitat no vàlida"
#: config.c:978
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
#: config.c:997
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s"
#: config.c:1000
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
#: config.c:1003
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s"
#: config.c:1006
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul "
"%s: %s"
#: config.c:1009
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: "
"%s"
#: config.c:1012
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s"
#: config.c:1107
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»"
#: config.c:1116
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "«%s» per a «%s» no és una marca de temps vàlida"
#: config.c:1207
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
#: config.c:1221 config.c:1232
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivell de compressió de zlib incorrecte %d"
#: config.c:1324
msgid "core.commentChar should only be one character"
msgstr ""
#: config.c:1357
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode de creació d'objecte no vàlid: %s"
#: config.c:1429
#, c-format
msgid "malformed value for %s"
msgstr "valor no vàlid per a %s"
#: config.c:1455
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
#: config.c:1456
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
#: config.c:1517 builtin/pack-objects.c:3399
#, c-format
msgid "bad pack compression level %d"
msgstr "nivell de compressió de paquet %d Erroni"
#: config.c:1638
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»"
#: config.c:1641
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "la referència «%s» no assenyala a un blob"
#: config.c:1658
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no s'ha pogut resoldre el blob de configuració: «%s»"
#: config.c:1688
#, c-format
msgid "failed to parse %s"
msgstr "s'ha produït un error en analitzar %s"
#: config.c:1744
msgid "unable to parse command-line config"
msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
#: config.c:2093
msgid "unknown error occurred while reading the configuration files"
msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
#: config.c:2263
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s no vàlid: «%s»"
#: config.c:2306
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte "
"«keep»"
#: config.c:2332
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100"
#: config.c:2378
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres"
#: config.c:2380
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d"
#: config.c:2461
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de secció no vàlid «%s»"
#: config.c:2493
#, c-format
msgid "%s has multiple values"
msgstr "%s té múltiples valors"
#: config.c:2522
#, c-format
msgid "failed to write new configuration file %s"
msgstr "no es pot escriure un nou fitxer de configuració %s"
#: config.c:2774 config.c:3098
#, c-format
msgid "could not lock config file %s"
msgstr "no s'ha pogut blocar el fitxer de configuració %s"
#: config.c:2785
#, c-format
msgid "opening %s"
msgstr "s'està obrint %s"
#: config.c:2820 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "patró no vàlid: %s"
#: config.c:2845
#, c-format
msgid "invalid config file %s"
msgstr "fitxer de configuració no vàlid %s"
#: config.c:2858 config.c:3111
#, c-format
msgid "fstat on %s failed"
msgstr "ha fallat «fstat» a %s"
#: config.c:2869
#, c-format
msgid "unable to mmap '%s'"
msgstr "no s'ha pogut fer «mmap» «%s»"
#: config.c:2878 config.c:3116
#, c-format
msgid "chmod on %s failed"
msgstr "ha fallat chmod a %s"
#: config.c:2963 config.c:3213
#, c-format
msgid "could not write config file %s"
msgstr "no s'ha pogut escriure el fitxer de configuració «%s»"
#: config.c:2997
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no s'ha pogut establir «%s» a «%s»"
#: config.c:2999 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "no s'ha pogut desassignar «%s»"
#: config.c:3089
#, c-format
msgid "invalid section name: %s"
msgstr "nom de secció no vàlida: %s"
#: config.c:3256
#, c-format
msgid "missing value for '%s'"
msgstr "falta el valor per «%s»"
#: connect.c:61
msgid "the remote end hung up upon initial contact"
msgstr "el costat remot ha penjat en el moment de contacte inicial"
#: connect.c:63
msgid ""
"Could not read from remote repository.\n"
"\n"
"Please make sure you have the correct access rights\n"
"and the repository exists."
msgstr ""
"No s'ha pogut llegir del dipòsit remot.\n"
"\n"
"Assegureu-vos que tingueu els permisos\n"
"d'accés correctes i que el dipòsit existeixi."
#: connect.c:81
#, c-format
msgid "server doesn't support '%s'"
msgstr "el servidor no és compatible amb «%s»"
#: connect.c:103
#, c-format
msgid "server doesn't support feature '%s'"
msgstr "el servidor no és compatible amb la característica «%s»"
#: connect.c:114
msgid "expected flush after capabilities"
msgstr ""
#: connect.c:233
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr ""
#: connect.c:252
msgid "protocol error: unexpected capabilities^{}"
msgstr ""
#: connect.c:273
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
"s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
#: connect.c:275
msgid "repository on the other end cannot be shallow"
msgstr ""
#: connect.c:313
msgid "invalid packet"
msgstr "paquet no vàlid"
#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "s'ha produït un error de protocol: no s'esperava «%s»"
#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "resposta de ls-refs no vàlida: %s"
#: connect.c:445
msgid "expected flush after ref listing"
msgstr ""
#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr "el protocol «%s» no és compatible"
#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "no s'ha pogut establir SO_KEEPALIVE al sòcol"
#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr "S'està cercant %s..."
#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "no s'ha pogut trobar %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
"fet.\n"
"S'està connectant a %s (port %s) ... "
#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
"%s"
msgstr ""
"no s'ha pogut connectar a %s:\n"
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
#: connect.c:671 connect.c:748
msgid "done."
msgstr "fet."
#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr "no s'ha pogut trobar %s (%s)"
#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr "port desconegut %s"
#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "s'ha bloquejat el nom estrany d'amfitrió «%s»"
#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr "s'ha bloquejat el port estrany «%s»"
#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr "no s'ha pogut iniciar servidor intermediari «%s»"
#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "no s'ha especificat un camí; vegeu «git help pull» per la sintaxis vàlida per URL"
#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr "la variant «simple» d'ssh no és compatible amb -4"
#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr "la variant «simple» d'ssh no és compatible amb -6"
#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr "la variant «simple» d'ssh no permet definir el port"
#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "s'ha bloquejat el nom de fitxer extrany «%s»"
#: connect.c:1307
msgid "unable to fork"
msgstr "no s'ha pogut bifurcar"
#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "S'està comprovant la connectivitat"
#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "No s'ha pogut executar 'git rev-list'"
#: connected.c:118
msgid "failed write to rev-list"
msgstr "escriptura fallada al rev-list"
#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "s'ha produït un error en tancar l'stdin del rev-list"
#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr ""
#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "CRLF es reemplaçà per LF en %s."
#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
"CRLF serà reemplaçat per LF en %s.\n"
"El fitxer tindrà els seus terminadors de línia originals en el vostre "
"directori de treball."
#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LF es reemplaçà per LF en %s"
#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
"LF serà reemplaçat per CRLF en %s.\n"
"El fitxer tindrà els seus terminadors de línia originals en el vostre "
"directori de treball."
#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
"tree-encoding."
msgstr ""
#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
"%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "s'ha produït un error en codificar «%s» des de %s a %s"
#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "codificar «%s» des de %s a %s i cap enrere no és el mateix"
#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "no es pot bifurcar per a executar el filtre extern «%s»"
#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "no es pot alimentar l'entrada al filtre extern «%s»"
#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr "el filtre extern «%s» ha fallat %d"
#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr "la lectura del filtre extern «%s» ha fallat"
#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr "el filtre extern «%s» ha fallat"
#: convert.c:844
msgid "unexpected filter type"
msgstr "tipus de filtre inesperat"
#: convert.c:855
msgid "path name too long for external filter"
msgstr ""
#: convert.c:929
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
#: convert.c:1228
msgid "true/false are no valid working-tree-encodings"
msgstr ""
#: convert.c:1398 convert.c:1432
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: el filtre de netejat «%s» ha fallat"
#: convert.c:1476
#, fuzzy, c-format
msgid "%s: smudge filter %s failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
#: date.c:137
msgid "in the future"
msgstr "en el futur"
#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "fa %<PRIuMAX> segon"
msgstr[1] "fa %<PRIuMAX> segons"
#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "fa %<PRIuMAX> minut"
msgstr[1] "fa %<PRIuMAX> minuts"
#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "fa %<PRIuMAX> hora"
msgstr[1] "fa %<PRIuMAX> hores"
#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "fa %<PRIuMAX> dia"
msgstr[1] "fa %<PRIuMAX> dies"
#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "fa %<PRIuMAX> setmana"
msgstr[1] "fa %<PRIuMAX> setmanes"
#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "fa %<PRIuMAX> mes"
msgstr[1] "fa %<PRIuMAX> mesos"
#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[0] "%<PRIuMAX> any"
msgstr[1] "%<PRIuMAX> anys"
#. TRANSLATORS: "%s" is "<n> years"
#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "fa %s i %<PRIuMAX> mes"
msgstr[1] "fa %s i %<PRIuMAX> mesos"
#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "fa %<PRIuMAX> any"
msgstr[1] "fa %<PRIuMAX> anys"
#: delta-islands.c:272
msgid "Propagating island marks"
msgstr "S'estan propagant les marques d'illa"
#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr "objecte d'arbre malmès %s"
#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr ""
"s'ha produït un error en carregar l'expressió regular de l'illa per «%s»: %s"
#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
"l'expressió regular de l'illa des de la configuració té massa grups de "
"captura (màx=%d)"
#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Marcades %d illes, fet.\n"
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
#: diffcore-rename.c:544
msgid "Performing inexact rename detection"
msgstr "S'està realitzant una detecció inexacta de canvis de nom"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<opcions>] <camí> <camí>"
#: diff-no-index.c:263
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
msgstr ""
"No és un dipòsit Git. Useu --no-index per a comparar dos camins fora del "
"directori de treball"
#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" S'ha produït un error en analitzar el percentatge limitant de dirstat "
"«%s»\n"
#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paràmetre de dirstat desconegut «%s»\n"
#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
"el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
"«zebra», «dimmed-zebra» o «plain»"
#: diff.c:324
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
#: diff.c:332
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr ""
#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor desconegut de la variable de configuració de 'diff.submodule': «%s»"
#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
"S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
"%s"
#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "el diff external s'ha mort, s'està aturant a %s"
#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check i -s són mútuament excloents"
#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S and --find-object són mútuament excloents"
#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr "valor --stat no vàlid: %s"
#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "%s espera un valor numèric"
#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s"
#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valor desconegut després de ws-error-highlight=%.*s"
#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr "no s'ha pogut resoldre «%s»"
#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s esperava un caràcter, s'ha rebut «%s»"
#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "paràmetre --color-moved incorrecte: %s"
#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode «%s» no vàlid en -color-moved-ws"
#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"l'opció diff-algorithm accepta «myers», «minimalminimal», \"patience\" and "
"«histogram»"
#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr "argument no vàlid a %s"
#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
"s'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "paràmetre --word-diff incorrecte: %s"
#: diff.c:5270
msgid "Diff output format options"
msgstr "Opcions del format de sortida del diff"
#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr "generant pedaç"
#: diff.c:5275 builtin/log.c:182
msgid "suppress diff output"
msgstr "omet la sortida de diferències"
#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr "<n>"
#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr "genera diffs amb <n> línies de context"
#: diff.c:5286
msgid "generate the diff in raw format"
msgstr "genera el diff en format cru"
#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr "sinònim de per a «-p --raw»"
#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr "sinònim de per a «-p --stat»"
#: diff.c:5297
msgid "machine friendly --stat"
msgstr "llegible per màquina --stat"
#: diff.c:5300
msgid "output only the last line of --stat"
msgstr "mostra només l'última línia de --stat"
#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr "sinònim per -dirstat=cumulative"
#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinònim per --dirstat=files,param1,param2..."
#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
#: diff.c:5321
msgid "show only names of changed files"
msgstr "mostra només els noms de fitxers canviats"
#: diff.c:5324
msgid "show only names and status of changed files"
msgstr "mostra només els noms i l'estat dels fitxers canviats"
#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
#: diff.c:5327
msgid "generate diffstat"
msgstr "genera diffstat"
#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr "<amplada>"
#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr "genera diffstat amb una amplada donada"
#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr "genera diffstat amb un nom d'amplada donat"
#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr "genera diffstat amb una amplada de graf donada"
#: diff.c:5338
msgid "<count>"
msgstr "<comptador>"
#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr "genera diffstat amb línies limitades"
#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr "genera un resum compacte a diffstat"
#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr "diff amb sortida binaria que pot ser aplicada"
#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
#: diff.c:5350
msgid "show colored diff"
msgstr "mostra un diff amb colors"
#: diff.c:5351
msgid "<kind>"
msgstr ""
#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
msgstr "<prefix>"
#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr ""
#: diff.c:5362
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr "afegir un prefix addicional per a cada línia de sortida"
#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr "no mostris cap prefix d'origen o destí"
#: diff.c:5371
#, fuzzy
msgid "show context between diff hunks up to the specified number of lines"
msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr "<char>"
#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr "especifiqueu el caràcter per a indicar una línia nova en comptes de «+»"
#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr "especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»"
#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr "especifiqueu el caràcter per a indicar context en comptes de « »"
#: diff.c:5389
msgid "Diff rename options"
msgstr "Opcions de canvi de nom del diff"
#: diff.c:5390
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "divideix els canvis de reescriptura completa en parells de suprimir i crear"
#: diff.c:5395
msgid "detect renames"
msgstr "detecta els canvis de noms"
#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr "omet les preimatges per les supressions"
#: diff.c:5402
msgid "detect copies"
msgstr "detecta còpies"
#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr "usa els fitxers no modificats com a font per trobar còpies"
#: diff.c:5408
msgid "disable rename detection"
msgstr "inhabilita la detecció de canvis de nom"
#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr "usa els blobs buits com a font de canvi de nom"
#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr "continua llistant l'històric d'un un fitxer més enllà dels canvis de nom"
#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
#: diff.c:5418
msgid "Diff algorithm options"
msgstr "Opcions d'algorisme Diff"
#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr "produeix el diff més petit possible"
#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr "ignora els espai en blanc en comparar línies"
#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr "ignora els canvis en la quantitat d'espai en blanc"
#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr "ignora els canvis d'espai en blanc al final de la línia"
#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr "ignora els retorns de línia al final de la línia"
#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr "ignora els canvis en línies que estan en blanc"
#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera diff usant l'algorisme «patience diff»"
#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera diff usant l'algorisme «histogram diff»"
#: diff.c:5447
msgid "<algorithm>"
msgstr "<algorisme>"
#: diff.c:5448
msgid "choose a diff algorithm"
msgstr "escolliu un algorisme pel diff"
#: diff.c:5450
msgid "<text>"
msgstr "<text>"
#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera diff usant l'algorisme «anchored diff»"
#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr "<mode>"
#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr "<regex>"
#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr ""
#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
#: diff.c:5463
msgid "moved lines of code are colored differently"
msgstr ""
#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr ""
#: diff.c:5469
#, fuzzy
msgid "Other diff options"
msgstr "Opcions genèriques"
#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
#: diff.c:5475
msgid "treat all files as text"
msgstr "tracta tots els fitxers com a text"
#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr ""
#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "surt amb 1 si hi ha diferències, 0 en cas contrari"
#: diff.c:5481
msgid "disable all output of the program"
msgstr "inhabilita totes les sortides del programa"
#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr ""
#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr ""
#: diff.c:5487
msgid "<when>"
msgstr "<quan>"
#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr "ignora els canvis als submòduls en la generació del diff"
#: diff.c:5491
msgid "<format>"
msgstr "<format>"
#: diff.c:5492
msgid "specify how differences in submodules are shown"
msgstr "especifiqueu com es mostren els canvis als submòduls"
#: diff.c:5496
#, fuzzy
msgid "hide 'git add -N' entries from the index"
msgstr "usa .gitattributes només des de l'índex"
#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
#: diff.c:5501
msgid "<string>"
msgstr "<cadena>"
#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
#: diff.c:5508
#, fuzzy
msgid "show all changes in the changeset with -S or -G"
msgstr "mostra els fitxers coincidents en el paginador"
#: diff.c:5511
#, fuzzy
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "usa les expressions regulars POSIX ampliades"
#: diff.c:5514
#, fuzzy
msgid "control the order in which files appear in the output"
msgstr "mostra en la sortida els altres fitxers"
#: diff.c:5515
#, fuzzy
msgid "<object-id>"
msgstr "objecte"
#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
#: diff.c:5519
msgid "select files by diff type"
msgstr "seleccioneu els fitxer per tipus de diff"
#: diff.c:5521
msgid "<file>"
msgstr "<fitxer>"
#: diff.c:5522
msgid "Output to a specific file"
msgstr "Sortida a un fitxer específic"
#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr "s'ha omès la detecció de canvi de nom inexacta a causa de massa fitxers."
#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
"només s'han trobat còpies des de camins modificats a causa de massa fitxers."
#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
"l'ordre."
#: dir.c:537
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96 af6b65d45e Git 2.26.2 7397ca3373 Git 2.25.4 b86a4be245 Git 2.24.3 f2771efd07 Git 2.23.3 c9808fa014 Git 2.22.4 9206d27eb5 Git 2.21.3 041bc65923 Git 2.20.4 76b54ee9b9 Git 2.19.5 ba6f0905fd Git 2.18.4 df5be6dc3f Git 2.17.5 1a3609e402 fsck: reject URL with empty host in .gitmodules e7fab62b73 credential: treat URL with empty scheme as invalid c44088ecc4 credential: treat URL without scheme as invalid fe29a9b7b0 credential: die() when parsing invalid urls a2b26ffb1a fsck: convert gitmodules url to URL passed to curl 8ba8ed568e credential: refuse to operate when missing host or protocol 24036686c4 credential: parse URL without host as empty host, not unset 73aafe9bc2 t0300: use more realistic inputs a88dbd2f8c t0300: make "quit" helper more realistic de49261b05 Git 2.26.1 274b9cc253 Git 2.26 55a7568606 Merge branch 'en/rebase-backend' c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git 1557364fb4 l10n: tr.po: change file mode to 644 2da1b05674 t3419: prevent failure when run with EXPENSIVE 1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0 5804c6ec40 l10n: de.po: add missing space 98cedd0233 Merge https://github.com/prati0100/git-gui 4914ba4bcf l10n: tr: Fix a couple of ambiguities a5728022e0 Merge branch 'py/remove-tcloo' 7fcb965970 RelNotes/2.26.0: fix various typos f0c03bcf95 l10n: Update Catalan translation 67b0a24910 Git 2.25.3 be8661a328 Sync with Git 2.25.2 0822e66b5d Git 2.25.2 65588b0b2e unicode: update the width tables to Unicode 13.0 7be274b0ff Merge branch 'js/ci-windows-update' into maint 9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint 221887a492 Merge branch 'jk/doc-credential-helper' into maint 32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint 618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint 50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint 41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint 2d7247af6f Merge branch 'am/mingw-poll-fix' into maint 4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint 76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint 569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint 16a4bf1035 Merge branch 'en/check-ignore' into maint 3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint 56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint 1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint 7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint 93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint 758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint 506223f9c5 Git 2.24.2 17a02783d8 Git 2.23.2 69fab82147 Git 2.22.3 fe22686494 Git 2.21.2 d1259ce117 Git 2.20.3 a5979d7009 Git 2.19.4 21a3e5016b Git 2.18.3 c42c0f1297 Git 2.17.4 d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u) 3891a84ccd git-gui: create a new namespace for chord script evaluation 8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5 440e7442d1 l10n: zh_CN: Revise v2.26.0 translation 2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 6c85aac65f Git 2.26-rc2 74f172e39e Merge branch 'en/test-cleanup' e96327c947 Merge branch 'es/outside-repo-errmsg-hints' ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 15fa8d9667 l10n: vi: fix translation + grammar 5c20398699 prefix_path: show gitdir if worktree unavailable 1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) a4a2f64642 Merge branch 'js/askpass-coerce-utf8' 850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows d769dcc5cd Merge branch 'py/blame-status-error' 70e24186c0 t6022, t6046: fix flaky files-are-updated checks 30e9940356 Hopefully the final batch before -rc2 b4f0038525 Merge branch 'en/rebase-backend' 25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master 07259e74ec fsck: detect gitmodules URLs with embedded newlines c716fe4bd9 credential: detect unrepresentable values when parsing urls 17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr 9a6bbee800 credential: avoid writing values with newlines 17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2 1afe18a3bb l10n: es: 2.26.0 round#2 5ab9217a3c Merge branch of github.com:alshopov/git-po into master c6713676d6 Merge branch of github.com:bitigchi/git-po into master b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t) 2713dec02d l10n: tr: v2.26.0 round 2 c9ef57cc3a l10n: fr : v2.26.0 rnd 2 120b1eb731 git-rebase.txt: highlight backend differences with commit rewording 9a1b7474d6 sequencer: clear state upon dropping a become-empty commit 937d143630 i18n: unmark a message in rebase.c a56d361f66 Merge branch 'ds/sparse-add' 5fa9169ced Merge branch 'dr/push-remote-ref-update' cdef998b46 Merge branch 'jc/doc-single-h-is-for-help' 051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) 52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master 9643441983 l10n: tr: Add glossary for Turkish translations 438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git 2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u) dd2c269652 l10n: tr: Add Turkish translations 8f4f099f8b l10n: tr: Add Turkish translation team info b4374e96c8 Git 2.26-rc1 4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch' 3658d77f8e Merge branch 'hd/show-one-mergetag-fix' 6125104b88 Merge branch 'rt/format-zero-length-fix' 1ac37deba2 Merge branch 'am/mingw-poll-fix' cf372dc815 Merge branch 'en/test-cleanup' d1075adfdf Merge branch 'en/merge-path-collision' a4fd114ffc Merge branch 'kk/complete-diff-color-moved' a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file' 0e0d717537 Merge branch 'pb/am-show-current-patch' 9b7f726dfc Merge branch 'am/pathspec-f-f-more' 4605a73073 t1091: don't grep for `strerror()` string 4d9c2902a1 l10n: fr v2.26.0 rnd1 ad182bee3f Merge branch of github.com:alshopov/git-po into master 23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1 98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t) f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed) 76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po 076cbdcd73 Git 2.26-rc0 0d65f3fb1a t5537: adjust test_oid label e63cefb024 Merge branch 'hi/gpg-use-check-signature' 5da7329e29 Merge branch 'rs/commit-graph-code-simplification' 0108fc1b46 Merge branch 'js/ci-windows-update' f3ccd9f0d9 Merge branch 'be/describe-multiroot' a6b4709302 Merge branch 'ag/rebase-remove-redundant-code' b22db265d6 Merge branch 'es/recursive-single-branch-clone' e8e71848ea Merge branch 'jk/nth-packed-object-id' a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch' 4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere' 49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix' 2cbb058669 Merge branch 'bc/wildcard-credential' 25063e2530 Merge branch 'mr/bisect-in-c-1' f4d7dfce4d Merge branch 'ds/sparse-add' 4d864895a2 t2402: test worktree path when called in .git directory af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch() 7655b4119d remote-curl: show progress for fetches over dumb HTTP 2f268890c2 The eighth batch for 2.26 aa5a7e02ad Merge branch 'ma/test-cleanup' 58595e713c Merge branch 'rs/blame-typefix-for-fingerprint' ff41848e99 Merge branch 'rs/micro-cleanups' 4cbf1a0e22 Merge branch 'es/worktree-cleanup' 46703057c1 Merge branch 'ak/test-log-graph' 777815f5f9 Merge branch 'jk/run-command-formatfix' 444cff61b4 Merge branch 'ds/partial-clone-fixes' 48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure' 8c22bd9ff9 Merge branch 'en/rebase-backend' cb2f5a8e97 Merge branch 'en/check-ignore' 0df82d99da Merge branch 'jk/object-filter-with-bitmap' 80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix' 29b09c518c Merge branch 'jk/doc-diff-parallel' 237a28173f show_one_mergetag: print non-parent in hex form. 5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context" 6d1210e133 l10n: Update Catalan translation 0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification" 7329d94be7 config.mak.dev: re-enable -Wformat-zero-length 7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings 94f4d01932 mingw: workaround for hangs when sending STDIN 1ff466c018 Documentation: clarify that `-h` alone stands for `help` 65bf820d0e t6020: new test with interleaved lexicographic ordering of directories 9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it d5bb92eced t3035: prefer test_must_fail to bash negation for git commands b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions 42d180dd01 t602[1236], t6034: modernize test formatting 802050400a merge-recursive: apply collision handling unification to recursive case 7f487ce062 Azure Pipeline: switch to the latest agent pools 5ed9fc3fc8 ci: prevent `perforce` from being quarantined eafff6e41e t/lib-httpd: avoid using macOS' sed d68ce906c7 commit-graph: use progress title directly 30b1c7ad9d describe: don't abort too early when searching tags 240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to' 2d2118b814 The seventh batch for 2.26 325eb66830 Merge branch 'es/doc-mentoring' 87f17d790d Merge branch 'es/bright-colors' d0038f4b31 Merge branch 'bw/remote-rename-update-config' 132f600b06 clone: pass --single-branch during --recurse-submodules 47319576f1 submodule--helper: use C99 named initializer ffe005576a lib-log-graph: consolidate colored graph cmp logic 989eea958b lib-log-graph: consolidate test_cmp_graph logic bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching bb4995fc3f worktree: add utility to find worktree by pathname a80c4c2214 worktree: improve find_worktree() documentation 2fecc48cad packfile: drop nth_packed_object_sha1() 6ac9760a30 packed_object_info(): use object_id internally for delta base b99b6bcc57 packed_object_info(): use object_id for returning delta base 63f4a7fc01 pack-check: push oid lookup into loop e31c71083a pack-check: convert "internal error" die to a BUG() 500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps f66d4e0250 pack-objects: use object_id struct in pack-reuse code a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id 3f83fd5e44 pack-objects: read delta base oid into object_id struct 0763671b8e nth_packed_object_oid(): use customary integer return 02bbbe9df9 worktree: drop unused code from get_main_worktree() 27f182b3fc blame: provide type of fingerprints pointer b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere df126ca142 t3400: make test clean up after itself 3c29e21eb0 t: drop debug `cat` calls cac439b56d t9810: drop debug `cat` call 91de82adc9 t4117: check for files using `test_path_is_file` 4ef346482d receive.denyCurrentBranch: respect all worktrees f8692114db t5509: use a bare repository for test push target 45f274fbb1 get_main_worktree(): allow it to be called in the Git directory fd0bc17557 completion: add diff --color-moved[-ws] 2ce6d075fa use strpbrk(3) to search for characters from a given set 2b3c430bce quote: use isalnum() to check for alphanumeric characters a51d9e8f07 t1050: replace test -f with test_path_is_file 3e96c66805 partial-clone: avoid fetching when looking for objects d0badf8797 partial-clone: demonstrate bugs in partial fetch 539052f42f run-command.h: fix mis-indented struct member 6c11c6a124 sparse-checkout: allow one-character directories in cone mode aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch e8ef1e8d6e am: convert "resume" variable to a struct bc8620b440 parse-options: convert "command mode" to a flag 62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE() 46fd7b3900 credential: allow wildcard patterns when matching config 82eb249853 credential: use the last matching username in the config 588c70e10f t0300: add tests for some additional cases 732f934408 t1300: add test for urlmatch with multiple wildcards 3fa0e04667 mailmap: add an additional email address for brian m. carlson 8a98758a8d stash push: support the --pathspec-from-file option 8c3713cede stash: eliminate crude option parsing 3f3d8068f5 doc: stash: synchronize <pathspec> description b22909144c doc: stash: document more options 0093abc286 doc: stash: split options from description (2) 2b7460d167 doc: stash: split options from description (1) 5f393dc3aa rm: support the --pathspec-from-file option fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags 73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure 6c69f22233 bisect: libify `bisect_next_all` 9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents 45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents e8e3ce6718 bisect: libify `bisect_checkout` ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents 7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()` 680e8a01e5 bisect: add enum to represent bisect returning codes bfacfce7d9 bisect--helper: introduce new `decide_next()` function b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0 292731c4c2 bisect--helper: change `retval` to `res` 16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays 7ec8125fba check-ignore: fix documentation and implementation to match 2607d39da3 doc-diff: use single-colon rule in rendering Makefile 0aa6ce3094 doc/config/push: use longer "--" line for preformatted example 20a5fd881a rev-list --count: comment on the use of count_right++ 63a58457e0 Merge branch 'py/missing-bracket' 51ebf55b93 The sixth batch for 2.26 f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints' 123538444f Merge branch 'jk/doc-credential-helper' e154451a2f Merge branch 'js/mingw-open-in-gdb' fc25a19265 Merge branch 'js/test-unc-fetch' 6365058605 Merge branch 'js/test-avoid-pipe' 966b69f02f Merge branch 'js/test-write-junit-xml-fix' d880c3de23 Merge branch 'jk/mailinfo-cleanup' 5d55554b1d Merge branch 'mr/show-config-scope' 9f3f38769d Merge branch 'rs/strbuf-insertstr' cbecc168d4 Merge branch 'rs/parse-options-concat-dup' 5af345a438 Merge branch 'bc/hash-independent-tests-part-8' 0460c109c3 Merge branch 'rs/name-rev-memsave' 6b9919c0a2 git-gui: add missing close bracket 5897e5ac96 Merge branch 'cs/german-translation' cf85a32eb6 git-gui: update German translation 5096e51c54 git-gui: extend translation glossary template with more terms 8b85bb1b70 git-gui: update pot template and German translation to current source code e68e29171c Sync with 2.25.1 c522f061d5 Git 2.25.1 10cdb9f38a rebase: rename the two primary rebase backends 2ac0d6273f rebase: change the default backend from "am" to "merge" 8295ed690b rebase: make the backend configurable via config setting 76340c8107 rebase tests: repeat some tests using the merge backend instead of am 980b482d28 rebase tests: mark tests specific to the am-backend with --am c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases 6d04ce75c4 git-prompt: change the prompt for interactive-based rebases 52eb738d6b rebase: add an --am option 8af14f0859 rebase: move incompatibility checks between backend options a bit earlier be50c938df git-rebase.txt: add more details about behavioral differences of backends befb89ce7c rebase: allow more types of rebases to fast-forward 9a70f3d4ae t3432: make these tests work with either am or merge backends 93122c985a rebase: fix handling of restrict_revision 55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer 8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling 7db00f0b3b t3406: simplify an already simple test e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty d48e5e21da rebase (interactive-backend): make --keep-empty the default e0020b2f82 prefix_path: show gitdir when arg is outside repo cc4f2eb828 doc: move credential helper info into gitcredentials(7) bfdd66e72f Sync with maint 7ae7e234c7 The fifth batch for 2.26 53c3be2c29 Merge branch 'tb/commit-graph-object-dir' 7b029ebaef Merge branch 'jk/index-pack-dupfix' aa21cc97bd Merge branch 'jk/alloc-cleanups' 883326077a Merge branch 'jh/notes-fanout-fix' f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule' 78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs' df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' 433b8aac2e Merge branch 'ds/sparse-checkout-harden' 4a77434bc8 Merge branch 'ld/p4-cleanup-processes' 8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone' 09e48400a3 Merge branch 'jk/get-oid-error-message-i18n' 4dbeecba27 Merge branch 'ag/edit-todo-drop-check' f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2' d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout' 251187084d Merge branch 'js/rebase-i-with-colliding-hash' c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix' 56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store' 0da63da794 Merge branch 'jn/promote-proto2-to-default' a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup' daef1b300b Merge branch 'hw/advice-add-nothing' 6141e0cc00 Merge branch 'js/convert-typofix' into maint 4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint 5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint 7137d6089b Merge branch 'ms/doc-bundle-format' into maint 52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint 0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint 1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint 153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint 8857657cc9 Merge branch 'jt/t5616-robustify' into maint 1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint f468972671 Merge branch 'bc/misconception-doc' into maint 6e69042e26 Merge branch 'bc/author-committer-doc' into maint 650ed395be Merge branch 'ds/refmap-doc' into maint 80b806f1a8 Merge branch 'bc/actualmente' into maint eceff4ba12 Merge branch 'rt/submodule-i18n' into maint 8a17eb7972 Merge branch 'jk/test-fixes' into maint 54bbadaeca Merge branch 'jk/asan-build-fix' into maint 8dbeba198e Merge branch 'ds/sparse-cone' into maint e361f36f61 Merge branch 'nd/switch-and-restore' into maint 4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint 5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint 9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint 3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint 3ab3185f99 pack-objects: support filters with bitmaps 84243da129 pack-bitmap: implement BLOB_LIMIT filtering 4f3bd5606a pack-bitmap: implement BLOB_NONE filtering cc4aa28506 bitmap: add bitmap_unset() function 2aaeb9ac41 rev-list: use bitmap filters for traversal 6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure 4eb707ebd6 rev-list: allow commit-only bitmap traversals ea047a8eb4 t5310: factor out bitmap traversal comparison 608d9c9365 rev-list: allow bitmaps when counting objects 55cb10f9b5 rev-list: make --count work with --objects 792f811998 rev-list: factor out bitmap-optimized routines d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs 08809c09aa mingw: add a helper function to attach GDB to the current process bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths de26f02db1 t9001, t9116: avoid pipes a2dc43414c MyFirstContribution: rephrase contact info e03f928e2a rev-list: fallback to non-bitmap traversal when filtering acac50dd8c pack-bitmap: fix leak of haves/wants object lists 551cf8b655 pack-bitmap: factor out type iterator initialization d8437c57fa The fourth batch for 2.26 a3dcf84df0 Merge branch 'js/convert-typofix' 0de2d1409b Merge branch 'js/ci-squelch-doc-warning' 0410c2ba31 Merge branch 'jb/multi-pack-index-docfix' 0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example' e99c325bb4 Merge branch 'ms/doc-bundle-format' afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix' db72f8c940 Merge branch 'jb/parse-options-message-fix' 3d2471ba85 Merge branch 'ma/filter-branch-doc-caret' b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path' 44cba9c4b3 Merge branch 'jc/skip-prefix' 556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index' 17e4a1b141 Merge branch 'hw/doc-git-dir' 4cf7f48891 Merge branch 'jk/push-default-doc' b783391018 Merge branch 'jk/clang-sanitizer-fixes' a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache' 3f7553acf5 Merge branch 'jt/t5616-robustify' 341f8a6476 Merge branch 'jk/escaped-wildcard-dwim' b486d2ee81 Merge branch 'jn/pretend-object-doc' 076ee3e8a2 tests: fix --write-junit-xml with subshells 2b0f19fa7a convert: fix typo c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors 1751b09a92 color.c: support bright aixterm colors 4a28eb0ae4 color.c: refactor color_output arguments f696a2b1c8 mailinfo: factor out some repeated header handling ffbea1816d mailinfo: be more liberal with header whitespace f447d0293e mailinfo: simplify parsing of header values b6537d83ee mailinfo: treat header values as C strings ef07659926 sparse-checkout: work with Windows paths 2631dc879d sparse-checkout: create 'add' subcommand 4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand 6fb705abcb sparse-checkout: extract add_patterns_from_input() b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config f2a2327a4a config: provide access to the current line number 923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values ceff1a1308 remote: clean-up config callback 1a83068c26 remote: clean-up by returning early to avoid one indentation 88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types 145d59f482 config: add '--show-scope' to print the scope of a config value 9a83d088ee submodule-config: add subomdule config scope e37efa40e1 config: teach git_config_source to remember its scope 5c105a842e config: preserve scope in do_git_config_sequence 6766e41b8a config: clarify meaning of command line scoping 6dc905d974 config: split repo scope to local and worktree a5cb4204b6 config: make scope_name non-static and rename it 30183894ea ci: ignore rubygems warning in the "Documentation" job 7a9f8ca805 parse-options: simplify parse_options_dup() c84078573e parse-options: const parse_options_concat() parameters f904f9025f parse-options: factor out parse_options_count() a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat() 517b60564e mailinfo: don't insert header prefix for handle_content_type() a91cc7fad0 strbuf: add and use strbuf_insertstr() eb31044ff7 pack-format: correct multi-pack-index description 9299f84921 diff-options.txt: avoid "regex" overload in example 7378ec90e1 doc: describe Git bundle format f3037657e8 t6024: update for SHA-256 edf04243b2 t6006: make hash size independent 5db24dcffd t6000: abstract away SHA-1-specific constants d341e0805d t5703: make test work with SHA-256 88ed241a7e t5607: make hash size independent 48c10cc0e6 t5318: update for SHA-256 f7ae8e69b6 t5515: make test hash independent e70649bb66 t5321: make test hash independent a30f93b143 t5313: make test hash independent a79eec220b t5309: make test hash independent 796d1383a3 t5302: make hash size independent 417e45e5e3 t4060: make test work with SHA-256 dfa5f53e78 t4211: add test cases for SHA-256 f743e8f5b3 t4211: move SHA-1-specific test cases into a directory 72f936b120 t4013: make test hash independent 5df0f11f07 t3311: make test work with SHA-256 07877f393c t3310: make test work with SHA-256 6025e898d6 t3309: make test work with SHA-256 7b1a1822fe t3308: make test work with SHA-256 94db7e3e93 t3206: make hash size independent db12505c2c t/lib-pack: support SHA-256 303b3c1c46 submodule: add newline on invalid submodule error 887a0fd573 add: change advice config variables used by the add API de93cc14ab The third batch for 2.26 ea46d9097b Merge branch 'mt/sparse-checkout-doc-update' ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix' b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend' 7ab963e122 Merge branch 'en/fill-directory-fixes-more' f52ab33616 Merge branch 'bc/hash-independent-tests-part-7' 25794d6ce9 Merge branch 'km/submodule-add-errmsg' d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity' 76c57fedfa Merge branch 'js/add-p-leftover-bits' 9a5315edfd Merge branch 'js/patch-mode-in-others-in-c' 381e8e9de1 Merge branch 'dl/test-must-fail-fixes' 395518cf7a parse-options: lose an unnecessary space in an error message 079f970971 name-rev: sort tip names before applying 2d53975488 name-rev: release unused name strings 977dc1912b name-rev: generate name strings only if they are better 1c56fc2084 name-rev: pre-size buffer in get_parent_name() ddc42ec786 name-rev: factor out get_parent_name() f13ca7cef5 name-rev: put struct rev_name into commit slab d689d6d82f name-rev: don't _peek() in create_or_update_name() 15a4205d96 name-rev: don't leak path copy in name_ref() 36d2419c9a name-rev: respect const qualifier 71620ca86c name-rev: remove unused typedef 3e2feb0d64 name-rev: rewrite create_or_update_name() a21781011f index-pack: downgrade twice-resolved REF_DELTA to die() dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout e1c5253951 t3305: check notes fanout more carefully and robustly e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st' ad2dd5bb63 commit-graph.c: remove path normalization, comparison 13c2499249 commit-graph.h: store object directory in 'struct commit_graph' 0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context' f38c92452d t7400: testcase for submodule status on unregistered inner git repos 5290d45134 tree-walk.c: break circular dependency with unpack-trees f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode e53ffe2704 sparse-checkout: escape all glob characters on write e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand bd64de42de sparse-checkout: unquote C-style strings over --stdin d585f0e799 sparse-checkout: write escaped patterns in cone mode 4f52c2ce6c sparse-checkout: properly match escaped characters 9abc60f801 sparse-checkout: warn on globs in cone patterns 145136a95a C: use skip_prefix() to avoid hardcoded string length 04e5b3f0b4 submodule foreach: replace $path with $sm_path in example 1793280e91 t5318: don't pass non-object directory to '--object-dir' da8063522f diff: move diff.wsErrorHighlight to "basic" config b98d188581 sha1-file: allow check_object_signature() to handle any repo 2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file() 7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare() c8123e72f6 streaming: allow open_istream() to handle any repo 5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile() a651946730 cache-tree: use given repo's hash_algo at verify_one() eb999b3295 diff: make diff_populate_filespec() honor its repo argument 5b0ca878e0 Sync with maint 344ee18728 The second batch 53a83299c7 Merge branch 'bc/misconception-doc' c9ccf9d09b Merge branch 'bc/author-committer-doc' 0d0fa20c40 Merge branch 'ss/t6025-modernize' 7050624abc Merge branch 'lh/bool-to-type-bool' 4b69f29271 Merge branch 'ds/refmap-doc' aff812ce3c Merge branch 'bc/actualmente' 38fb56e92a Merge branch 'rt/submodule-i18n' f0940743fa Merge branch 'js/builtin-add-i-cmds' 0afeb3fdf4 Merge branch 'jk/test-fixes' 808dab2b58 Merge branch 'jk/asan-build-fix' fec1ff97c2 Merge branch 'sg/completion-worktree' c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function' 11ad30b887 Merge branch 'hi/gpg-mintrustlevel' 96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases' d52adee779 Merge branch 'ds/graph-horizontal-edges' 6909474491 Merge branch 'am/update-pathspec-f-f-tests' 043426c8fd Merge branch 'ds/sparse-cone' 34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig' 8dd40c0472 traverse_trees(): use stack array for name entries 667b76ec58 walker_fetch(): avoid raw array length computation 9734b74a8f normalize_path_copy(): document "dst" size expectations 43f33e492a git-p4: avoid leak of file handle when cloning 19fa5ac333 git-p4: check for access to remote host earlier 6026aff5bb git-p4: cleanup better on error exit ca5b5cce62 git-p4: create helper function importRevisions() 4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable 5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce 837b3a6376 git-p4: make closeStreams() idempotent b0418303b1 sha1-name: mark get_oid() error messages for translation 2df1aa239c fetch: forgo full connectivity check if --filter 50033772d5 connected: verify promisor-ness of partial clone d82ad54945 git: update documentation for --git-dir 0ad7144999 .mailmap: map Yi-Jyun Pan's email c56c48dd07 grep: ignore --recurse-submodules if --no-index is given 8b2a1928f0 doc: drop "explicitly given" from push.default description cf82bff73f obstack: avoid computing offsets from NULL pointer 3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer d20bc01a51 avoid computing zero offsets from NULL pointer 7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero bc3f657f71 t1506: drop space after redirection operator e5d7b2f65c t1400: avoid "test" string comparisons 5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c c7a6207591 Sync with maint 7210ca4ee5 .mailmap: fix GGG authoship screwup 37a63faae5 t4124: only mark git command with test_must_fail a8c663cf65 t3507: use test_path_is_missing() 2def7f017c t3507: fix indentation e8a1c686ae t3504: do check for conflict marker after failed cherry-pick 1c9fd32fd2 t3419: stop losing return code of git command c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}() a781cd6fef t3415: stop losing return codes of git commands 86ce6e0dd1 t3310: extract common notes_merge_files_gone() 245b9ba0ba t3030: use test_path_is_missing() 4a6f11fd7b t2018: replace "sha" with "oid" 62e80fcb48 t2018: don't lose return code of git commands 30c0367668 t2018: teach do_checkout() to accept `!` arg 40caa5366a t2018: be more discerning when checking for expected exit codes b54128bb0b t5616: make robust to delta base change 4c616c2ba1 merge-recursive: use subtraction to flip stage ee798742bd merge-recursive: silence -Wxor-used-as-pow warning 39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin 3b2885ec9b submodule: fix status of initialized but not cloned submodules ace912bfb8 t7400: add a testcase for submodule status on empty dirs 4bb4fd4290 MyFirstContribution: add avenues for getting help 9e6d3e6417 sparse-checkout: detect short patterns 41de0c6fbc sparse-checkout: cone mode does not recognize "**" 7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone 47dbf10d8a clone: fix --sparse option with URLs 3c754067a1 sparse-checkout: create leading directories d622c34396 t1091: improve here-docs 522e641748 t1091: use check_files to reduce boilerplate 417be08d02 t1300: create custom config file without special characters 3de7ee369b t1300: fix over-indented HERE-DOCs 329e6ec397 config: fix typo in variable name 767a9c417e rebase -i: stop checking out the tip of the branch to rebase dfaed02862 fsmonitor: update documentation for hook version and watchman hooks e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2 d031049da3 completion: add support for sparse-checkout a402723e48 doc: sparse-checkout: mention --cone option 26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck b6992261de rebase -i: re-fix short SHA-1 collision d859dcad94 parse_insn_line(): improve error message when parsing failed d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects 92fb0db94c pack-objects: add checks for duplicate objects bb514de356 pack-objects: improve partial packfile reuse ff483026a9 builtin/pack-objects: introduce obj_is_packed() e704fc7978 pack-objects: introduce pack.allowPackReuse 2f4af77699 csum-file: introduce hashfile_total() 8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting() 59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile 40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains() 14fbd26044 ewah/bitmap: introduce bitmap_word_alloc() bc7a3d4dc0 The first batch post 2.25 cycle 09e393d913 Merge branch 'nd/switch-and-restore' 45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' 0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout' 36da2a8635 Merge branch 'es/unpack-trees-oob-fix' 42096c778d Merge branch 'bc/run-command-nullness-after-free-fix' 1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted' a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees' e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached' 9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting' 237a83a943 Merge branch 'dl/credential-netrc' a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir() 129510a067 t2405: clarify test descriptions and simplify test 4eaadc8493 t2405: use git -C and test_commit -C instead of subshells 773c60a45e t7410: rename to t2405-worktree-submodule.sh 7a2dc95cbc docs: mention when increasing http.postBuffer is valuable 1b13e9032f doc: dissuade users from trying to ignore tracked files 69e104d70e doc: provide guidance on user.name format 813f6025a5 docs: expand on possible and recommended user config options bc94e5862a doc: move author and committer information to git-commit(1) 7979dfe1d4 l10n: Update Catalan translation 81e3db42f3 templates: fix deprecated type option `--bool` c513a958b6 t6025: use helpers to replace test -f <path> 70789843bd t6025: modernize style 6a7aca6f01 doc: rm: synchronize <pathspec> description 856249c62a docs: use "currently" for the present time b40a50264a fetch: document and test --refmap="" a9ae8fde2e t3404: directly test the behavior of interest 22a69fda19 git-rebase.txt: update description of --allow-empty-message f1928f04b2 grep: use no. of cores as the default no. of threads 70a9fef240 grep: move driver pre-load out of critical section 1184a95ea2 grep: re-enable threads in non-worktree case 6c307626f1 grep: protect packed_git [re-]initialization c441ea4edc grep: allow submodule functions to run in parallel d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules() 1d1729caeb grep: replace grep_read_mutex by internal obj read lock 31877c9aec object-store: allow threaded access to object reading b1fc9da1c8 replace-object: make replace operations thread-safe d5b0bac528 grep: fix racy calls in grep_objects() faf123c730 grep: fix race conditions at grep_submodule() c3a5bb31c1 grep: fix race conditions on userdiff calls 0222540827 fetch: emphasize failure during submodule fetch 232378479e Sync with maint e4837b4406 t7800: don't rely on reuse_worktree_file() fbce03d329 t4018: drop "debugging" cat from hunk-header tests f65d07fffa Makefile: use compat regex with SANITIZE=address 849e43cc18 built-in add -i: accept open-ended ranges again d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files a4ffbbbb99 submodule.c: mark more strings for translation 0cbb60574e dir: point treat_leading_path() warning to the right place ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent 22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2 f365bf40a0 clean: demonstrate a bug with pathspecs b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x 277eb5af7c t5604: make hash independent 44b6c05b43 t5601: switch into repository to hash object 7a868c51c2 t5562: use $ZERO_OID 1b8f39fb0d t5540: make hash size independent a8c17e3bd6 t5537: make hash size independent 832072219c t5530: compute results based on object length 74ad99b1d8 t5512: abstract away SHA-1-specific constants ba1be1ab45 t5510: make hash size independent cba472d3ad t5504: make hash algorithm independent 82d5aeb1e6 t5324: make hash size independent 3c5e65cac1 t5319: make test work with SHA-256 235d3cddb8 t5319: change invalid offset for SHA-256 compatibility 1d86c8f0ce t5318: update for SHA-256 525a7f1769 t4300: abstract away SHA-1-specific constants 7a1bcb251b t4204: make hash size independent cb78f4f0fe t4202: abstract away SHA-1-specific constants 717c939d8f t4200: make hash size independent 08a9dd891c t4134: compute appropriate length constant 215b60bf07 t4066: compute index line in diffs 194264c185 t4054: make hash-size independent 7d5ecd775d completion: list paths and refs for 'git worktree add' 3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands 3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options 367efd54b3 completion: return the index of found word from __git_find_on_cmdline() d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function 2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper 54887b4689 gpg-interface: add minTrustLevel as a configuration option 684ceae32d fetch: default to protocol version 2 33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION 8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate b9ab170752 config doc: protocol.version is not experimental 07ef3c6604 fetch test: use more robust test for filtered objects d6509da620 fetch test: mark test of "skipping" haves as v0-only a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function bf66db37f1 add: use advise function to display hints c958d3bd0a graph: fix collapse of multiple edges 8588932e20 graph: add test to demonstrate horizontal line bug d0d0a357a1 t: directly test parse_pathspec_file() 568cabb2fe t: fix quotes tests for --pathspec-from-file f94f7bd00d t: add tests for error conditions with --pathspec-from-file b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job 12acdf573a built-in add -p: handle Escape sequences more efficiently e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode 04f816b125 built-in add -p: respect the `interactive.singlekey` config setting a5e46e6b01 terminal: add a new function to read a single keystroke 9ea416cb51 terminal: accommodate Git for Windows' default terminal 94ac3c31f7 terminal: make the code of disable_echo() reusable 08b1ea4c39 built-in add -p: handle diff.algorithm 180f48df69 built-in add -p: support interactive.diffFilter 1e4ffc765d t3701: adjust difffilter test c81638541c submodule add: show 'add --dry-run' stderr when aborting 8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token 56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token d0654dc308 Git 2.25 b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po 4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'" ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1 e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master 1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' d78a1968c5 Merge branch 'ma/config-advice-markup-fix' a20ae3ee29 l10n: Update Catalan translation 49e268e23e mingw: safeguard better against backslashes in file names 4c6c7971e0 unpack-trees: correctly compute result count 63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1 75449c1b39 l10n: de.po: Reword generation numbers 6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t) 3901d2c6bd config/advice.txt: fix description list separator 7a6a90c6ec Git 2.25-rc2 1f5f3ffe5c Merge branch 'ds/graph-assert-fix' a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix' 202f68b252 Merge branch 'pm/am-in-body-header-doc-update' 7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix' c5dc20638b Merge branch 'do/gitweb-typofix-in-comments' fe47c9cb5f Merge https://github.com/prati0100/git-gui a1087c9367 graph: fix lack of color in horizontal lines 0d251c3291 graph: drop assert() for merge with two collapsing parents 4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper 573117dfa5 unpack-trees: watch for out-of-range index position e701bab3e9 restore: invalidate cache-tree when removing entries with --staged 1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command fa74180d08 checkout: don't revert file on ambiguous tracking branches 2957709bd4 parse_branchname_arg(): extract part as new function 5020f6806a t2018: improve style of if-statement 7ffb54618b t2018: add space between function name and () 63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH 065027ee1a string-list: note in docs that callers can specify sorting function 26f924d50e unpack-trees: exit check_updates() early if updates are not wanted 042ed3e048 The final batch before -rc2 0f1930cd1b Merge branch 'ds/sparse-cone' 037f067587 Merge branch 'ds/commit-graph-set-size-mult' f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify' c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode' a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' c4117fcb97 Merge branch 'pb/clarify-line-log-doc' 556f0258df Merge branch 'ew/packfile-syscall-optim' 5814d44d9b doc: submodule: fix typo for command absorbgitdirs 7047f75f22 editorconfig: indent text files with tabs 60440d72db sha1-file: document how to use pretend_object_file 7fdc5f296f l10n: es: 2.25.0 round #1 f8740c586b am: document that Date: can appear as an in-body header 4e2c4c0d4f gitweb: fix a couple spelling errors in comments 421c0ffb02 multi-pack-index: correct configuration in documentation 757ff352bd Documentation/git-sparse-checkout.txt: fix a typo 0d2116c644 Merge branch 'zs/open-current-file' 9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u) 3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master 4c5081614c l10n: fr.po v2.25.0 rnd 1 5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0 63020f175f commit-graph: prefer default size_mult when given zero 224c7d70fa mingw: only test index entries for backslashes, not tree entries 9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED 8679ef24ed Git 2.25-rc1 a82027e9e6 Merge branch 'js/use-test-tool-on-path' 13432fc6dd Merge branch 'js/mingw-reserved-filenames' e0e1ac5db0 Merge branch 'en/rebase-signoff-fix' b76a244c9d Merge branch 'em/freebsd-cirrus-ci' bc855232bc Merge branch 'bk/p4-misc-usability' 763a59e71c merge-recursive: remove unnecessary oid_eq function 44143583b7 sparse-checkout: use extern for global variables d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master 13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1 786f4d2405 git-gui: allow opening currently selected file in default app 4fd683b6a3 sparse-checkout: document interactions with submodules de11951b03 sparse-checkout: list directories in cone mode 0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0 578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) 173fff68da Merge tag 'v2.25.0-rc0' into git-po-master f1842ff531 t2018: remove trailing space from test description 20a67e8ce9 t3008: find test-tool through path lookup 9e341f62ca l10n: Update Catalan translation 4e61b2214d packfile: replace lseek+read with pread ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision 2be45868a8 doc: log, gitk: document accepted line-log diff formats 280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD 0a76bd7381 mailmap: mask accentless variant for Công Danh 99c33bed56 Git 2.25-rc0 d2189a721c Merge branch 'en/fill-directory-fixes' 8be0a428d6 Merge branch 'rs/test-cleanup' 65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string' c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 45b96a6fa1 Merge branch 'js/add-p-in-c' ccc292e862 Merge branch 'jc/drop-gen-hdrs' dfee504bee Merge branch 'ja/doc-markup-cleanup' 87cbb1ca66 Merge branch 'rs/ref-read-cleanup' 20aa6d88b7 Merge branch 'rb/p4-lfs' fcd5b55f56 Merge branch 'pb/submodule-doc-xref' 4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free' ba6b66281e Merge branch 'ln/userdiff-elixir' bd72a08d6c Merge branch 'ds/sparse-cone' f3c520e17f Merge branch 'sg/name-rev-wo-recursion' 6514ad40a1 Merge branch 'ra/t5150-depends-on-perl' 17066bea38 Merge branch 'dl/format-patch-notes-config-fixup' 135365dd99 Merge branch 'am/pathspec-f-f-checkout' ff0cb70d45 Merge branch 'am/pathspec-from-file' 4dc42c6c18 mingw: refuse paths containing reserved names 98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16 c480eeb574 commit --interactive: make it work with the built-in `add -i` cee6cb7300 built-in add -p: implement the "worktree" patch modes 52628f94fc built-in add -p: implement the "checkout" patch modes 6610e4628a built-in stash: use the built-in `git add -p` if so configured 90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting 36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes d2a233cb8b built-in add -p: prepare for patch modes other than "stage" 761e3d26bb sparse-checkout: improve OS ls compatibility 6579d93a97 contrib/credential/netrc: work outside a repo 1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI b441717256 t1507: inline full_name() 9291e6329e t1507: run commands within test_expect_success 5236fce6b4 t1507: stop losing return codes of git commands 10812c2337 t1501: remove use of `test_might_fail cp` 62d58cda69 t1409: use test_path_is_missing() b87b02cfe6 t1409: let sed open its own input file 9b92070e52 t1307: reorder `nongit test_must_fail` 3595d10c26 t1306: convert `test_might_fail rm` to `rm -f` f511bc02ed t0020: use ! check_packed_refs_marked f6041abdcd t0020: don't use `test_must_fail has_cr` f46c243e66 t0003: don't use `test_must_fail attr_check` 99c049bc4c t0003: use test_must_be_empty() 3738439c77 t0003: use named parameters in attr_check() 7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err() b8afb908c2 t/lib-git-p4: use test_path_is_missing() 4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases 6836d2fe06 dir.c: use st_add3() for allocation size c847dfafee dir: consolidate similar code in treat_directory() 777b420347 dir: synchronize treat_leading_path() and read_directory_recursive() b9670c1f5e dir: fix checks on common prefix directory 5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit 23cbe427c4 Merge branch 'py/console-close-esc' 124a895811 t4015: improve coverage of function context test 509efef789 commit: forbid --pathspec-from-file --all 12029dc57d t3434: mark successful test as such e0f9095aaa notes.h: fix typos in comment 675ef6bab8 t6030: don't create unused file 01ed17dc8c t5580: don't create unused file f670adb49b t3501: don't create unused file 1e1ccbfdd3 git-gui: allow closing console window with Escape 7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays. b02fd2acca The sixth batch 59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex' e3b72391d1 Merge branch 'rs/commit-export-env-simplify' 43bf44e23a Merge branch 'rs/archive-zip-code-cleanup' 4438a1a59f Merge branch 'js/t3404-indent-fix' 3a44db2ed2 Merge branch 'dr/branch-usage-casefix' 8bc481f4f6 Merge branch 'sg/t9300-robustify' 011fc2e88e Merge branch 'js/add-i-a-bit-more-tests' d1c0fe8d9b Merge branch 'dl/range-diff-with-notes' 26c816a67d Merge branch 'hw/doc-in-header' f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 71a7de7a99 Merge branch 'dl/rebase-with-autobase' c9f5fc9114 Merge branch 'dl/test-cleanup' 6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap' 3beff388b2 Merge branch 'js/builtin-add-i-cmds' 4755a34c47 Merge branch 'dd/time-reentrancy' 37c2619d91 Merge branch 'ag/sequencer-todo-updates' 608e380502 git-p4: show detailed help when parsing options fail e2aed5fd5b git-p4: yes/no prompts should sanitize user text 571fb96573 fix-typo: consecutive-word duplications f371984613 Makefile: drop GEN_HDRS 2e4083198d built-in add -p: show helpful hint when nothing can be staged 54d9d9b2ee built-in add -p: only show the applicable parts of the help text ade246efed built-in add -p: implement the 'q' ("quit") command d6cf873340 built-in add -p: implement the '/' ("search regex") command 9254bdfb4f built-in add -p: implement the 'g' ("goto") command bcdd297b78 built-in add -p: implement hunk editing b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf" 11f2c0dae8 built-in add -p: coalesce hunks after splitting them 510aeca199 built-in add -p: implement the hunk splitting feature 0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions 5906d5de77 built-in app -p: allow selecting a mode change as a "hunk" 47dc4fd5eb built-in add -p: handle deleted empty files 80399aec5a built-in add -p: support multi-file diffs 7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed 12c24cf850 built-in add -p: color the prompt and the help text 25ea47af49 built-in add -p: adjust hunk headers as needed e3bd11b4eb built-in add -p: show colored hunks by default 1942ee44e8 built-in add -i: wire up the new C code for the `patch` command f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C d1b1384d61 userdiff: remove empty subexpression from elixir regex df5be01669 doc: indent multi-line items in list fd5041e127 doc: remove non pure ASCII characters 190a65f9db sparse-checkout: respect core.ignoreCase in cone mode 1d7297513d notes: break set_display_notes() into smaller functions 66f79ee23d config/format.txt: clarify behavior of multiple format.notes cc2bd5c45d gitmodules: link to gitsubmodules guide 99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed 8c02fe6060 t7004: don't create unused file cb05d6a5ed t4256: don't create unused file c5c4eddd56 dir: break part of read_directory_recursive() out for reuse 072a231016 dir: exit before wildcard fall-through if there is no wildcard 2f5d3847d4 dir: remove stray quote character in comment a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories" 452efd11fb t3011: demonstrate directory traversal failures ea94b16fb8 git-p4: honor lfs.storage configuration variable 51a0a4ed95 bisect--helper: avoid use-after-free d32e065a91 Merge branch 'kk/branch-name-encoding' ad05a3d8e5 The fifth batch 7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix' b089e5e6cb Merge branch 'em/test-skip-regex-illseq' 930078ba39 Merge branch 'hi/gpg-use-check-signature' 08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode' 7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk' 55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm' 41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress' 5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise' dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix' d37cfe3b5c Merge branch 'dl/pretty-reference' 99c4ff1bda Merge branch 'dl/submodule-set-url' 55d607d85b Merge branch 'js/mingw-inherit-only-std-handles' c58ae96fc4 Merge branch 'am/pathspec-from-file' 7c88714262 Merge branch 'po/bundle-doc-clonable' 5d9324e0f4 Merge branch 'ra/rebase-i-more-options' 7034cd094b Sync with Git 2.24.1 09ac67a183 format-patch: move git_config() before repo_init_revisions() 8164c961e1 format-patch: use --notes behavior for format.notes 452538c358 notes: extract logic into set_display_notes() e6e230eeae notes: create init_display_notes() helper 1e6ed5441a notes: rename to load_display_notes() 2866fd284c name-rev: cleanup name_ref() 49f7a2fde9 name-rev: eliminate recursion in name_rev() fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name' e05e8cf074 archive-zip: use enum for compression method 39acfa3d22 git gui: fix branch name encoding error 11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description 8cf8f9b4aa t3404: fix indentation 4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs 147ee35558 commit: use strbuf_add() to add a length-limited string 559c6fc317 The fourth batch 56e6c16394 Merge branch 'dl/lore-is-the-archive' 3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive' 7cb0d37f6d Merge branch 'tg/perf-remove-stale-result' 403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick' f0cf2fee5d Merge branch 'hi/grep-do-not-return-void' 391fb22ac7 Merge branch 'rs/use-skip-prefix-more' 92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd' 4ba74ca901 Merge branch 'rs/test-cleanup' f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick' ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9' 8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters 3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances dd432a6ecf name-rev: restructure parsing commits and applying date cutoff dd090a8a37 name-rev: pull out deref handling from the recursion 766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev() bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation e0c4da6f2a name-rev: avoid unnecessary cast in name_ref() c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name() c593a26348 t6120-describe: modernize the 'check_describe' helper abcf857300 range-diff: clear `other_arg` at end of function f8675343d7 range-diff: mark pointers as const 828765dfe0 t3206: fix incorrect test name 0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early 21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile b4bbbbd5a2 apply --allow-overlap: fix a corner case 89c8559367 git add -p: use non-zero exit code when the diff generation failed e91162be9c t3701: verify that the diff.algorithm config setting is handled 0c3222c4f3 t3701: verify the shown messages when nothing can be added 24be352d52 t3701: add a test for the different `add -p` prompts 8539b46534 t3701: avoid depending on the TTY prerequisite 0f0fba2cc8 t3701: add a test for advanced split-hunk editing 53a06cf39b Git 2.24.1 67af91c47a Sync with 2.23.1 a7312d1a28 Git 2.23.1 7fd9fd94fb Sync with 2.22.2 d9589d4051 Git 2.22.2 5421ddd8d0 Sync with 2.21.1 367f12b7e9 Git 2.21.1 20c71bcf67 Merge branch 'fix-msys2-quoting-bugs' 7d8b676992 mingw: sh arguments need quoting in more circumstances d9061ed9da t7415: drop v2.20.x-specific work-around 04522edbd4 mingw: fix quoting of empty arguments for `sh` 49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly fc346cb292 Sync with 2.20.2 4cd1cf31ef Git 2.20.2 c154745074 submodule: defend against submodule.update = !command in .gitmodules 4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x d851d94151 Sync with 2.19.3 caccc527ca Git 2.19.3 7c9fbda6e2 Sync with 2.18.2 9877106b01 Git 2.18.2 14af7ed5a9 Sync with 2.17.3 a5ab8d0317 Git 2.17.3 bb92255ebe fsck: reject submodule.update = !command in .gitmodules bdfef0492c Sync with 2.16.6 eb288bc455 Git 2.16.6 68440496c7 test-drop-caches: use `has_dos_drive_prefix()` 9ac92fed5b Sync with 2.15.4 7cdafcaacf Git 2.15.4 e904deb89d submodule: reject submodule.update = !command in .gitmodules d3ac8c3f27 Sync with 2.14.6 66d2a6159f Git 2.14.6 083378cc35 The third batch 88bd37a2d0 Merge branch 'js/pkt-line-h-typofix' 473b431410 Merge branch 'us/unpack-trees-fsmonitor' e0f9ec9027 Merge branch 'sg/test-bool-env' fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset' e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere' 88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory' 8feb47e882 Merge branch 'dl/t5520-cleanup' 6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree' 57d46bc602 Merge branch 'mg/doc-submodule-status-cached' 75bd003c7b Merge branch 'js/git-svn-use-rebase-merges' f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix' c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits' 36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree' cf91c31688 Merge branch 'sg/unpack-progress-throughput' ef6104581d Merge branch 'pb/submodule-update-fetches' 7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix' f3c7bfdde2 Merge branch 'dl/range-diff-with-notes' 9502b616f1 Merge branch 'jh/userdiff-python-async' 76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2' 995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label' f7998d9793 Merge branch 'js/builtin-add-i' 917d0d6234 Merge branch 'js/rebase-r-safer-label' 56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers' 2763530048 Merge branch 'jg/revert-untracked' fa38ab68b0 git-gui: revert untracked files by deleting them d9c6469f38 git-gui: update status bar to track operations 29a9366052 git-gui: consolidate naming conventions 0bb313a552 xdiff: unignore changes in function context 2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names' 65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods' 5532ebdeb7 Merge branch 'fix-mingw-quoting-bug' 76a681ce9c Merge branch 'dubiously-nested-submodules' dd53ea7220 Merge branch 'turn-on-protectntfs-by-default' f82a97eb91 mingw: handle `subst`-ed "DOS drives" 7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams' d2c84dad1c mingw: refuse to access paths with trailing spaces or periods 379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh 817ddd64c2 mingw: refuse to access paths with illegal characters cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors 7530a6287e quote-stress-test: allow skipping some trials 35edce2056 t6130/t9350: prepare for stringent Win32 path validation 55953c77c0 quote-stress-test: accept arguments to test via the command-line ad15592529 tests: add a helper to stress test argument quoting a8dee3ca61 Disallow dubiously-nested submodule git directories 9102f958ee protect_ntfs: turn on NTFS protection by default 91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams 6d8684161e mingw: fix quoting of arguments 3a85dc7d53 is_ntfs_dotgit(): speed it up 7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses 288a74bcd2 is_ntfs_dotgit(): only verify the leading segment a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark cae0bc09ab rebase: fix format.useAutoBase breakage 945dc55dda format-patch: teach --no-base 700e006c5d t4014: use test_config() a749d01e1d format-patch: fix indentation 0c47e06176 t3400: demonstrate failure with format.useAutoBase d9b31db2c4 t7700: stop losing return codes of git commands 3699d69df0 t7700: make references to SHA-1 generic dcf9a748ca t7700: replace egrep with grep cfe5eda02a t7700: consolidate code into test_has_duplicate_object() ae475afc0f t7700: consolidate code into test_no_missing_in_packs() 14b7664df8 doc: replace LKML link with lore.kernel.org d23f9c8e04 RelNotes: replace Gmane with real Message-IDs dcee037228 doc: replace MARC links with lore.kernel.org a9aecc7abb checkout, restore: support the --pathspec-from-file option cfd9376c1d doc: restore: synchronize <pathspec> description 8ea1189eac doc: checkout: synchronize <pathspec> description 6fdc9ad259 doc: checkout: fix broken text reference 1d022bb43f doc: checkout: remove duplicate synopsis bebb5d6d6b add: support the --pathspec-from-file option 21bb3083c3 cmd_add: prepare for next patch 4778452597 Merge branch 'prevent-name-squatting-on-windows' a7b1ad3b05 Merge branch 'jk/fast-import-unsafe' 525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()` e1d911dd4c mingw: disallow backslash characters in tree objects' file names 0060fd1511 clone --recurse-submodules: prevent name squatting on Windows a52ed76142 fast-import: disallow "feature import-marks" by default 68061e3470 fast-import: disallow "feature export-marks" by default 019683025f fast-import: delay creating leading directories for export-marks e075dba372 fast-import: stop creating leading directories for import-marks 11e934d56e fast-import: tighten parsing of boolean command line options 816f806786 t9300: create marks files for double-import-marks test f94804c1f2 t9300: drop some useless uses of cat 4f3e57ef13 submodule--helper: advise on fatal alternate error 10c64a0b3c Doc: explain submodule.alternateErrorStrategy ec48540fe8 packfile.c: speed up loading lots of packfiles 3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value a4fb016ba1 pkt-line: fix a typo 0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data 228f53135a The second batch 6c630f237e Merge branch 'jk/gitweb-anti-xss' 3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell' 4775e02a5c Merge branch 'ma/t7004' a6c6f8d02a Merge branch 'js/complete-svn-recursive' 3ae8defaf9 Merge branch 'jk/send-pack-remote-failure' aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix' 4ab9616c76 Merge branch 'sg/skip-skipped-prereq' 723a8adba5 Merge branch 'ds/test-read-graph' 9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation' 406ca29e0d Merge branch 'rs/parse-options-dup-null-fix' fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging' 8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion' ef8f621045 Merge branch 'dl/complete-rebase-onto' 3c3e5d0ea2 Merge branch 'tg/stash-refresh-index' 43c5fe1c1d Merge branch 'nn/doc-rebase-merges' 6511cb33c9 Merge branch 'dd/sequencer-utf8' f165457618 Merge branch 'jk/remove-sha1-to-hex' a774064fb0 Merge branch 'dj/typofix-merge-strat' ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates' d2489ce92c Merge branch 'rs/skip-iprefix' 376e7309e1 Merge branch 'ln/userdiff-elixir' 9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log' d3096d2ba6 Merge branch 'en/doc-typofix' 26f20fa3fc Merge branch 'ns/test-desc-typofix' ffd130a363 Merge branch 'en/t6024-style' 5149902ff9 Merge branch 'en/misc-doc-fixes' bcb06e204c Merge branch 'js/fetch-multi-lockfix' d08daec001 Merge branch 'rs/trace2-dots' fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix' bad5ed39cd Merge branch 'cb/curl-use-xmalloc' 7ab2088255 Merge branch 'rt/fetch-message-fix' f089ddd56a Merge branch 'es/myfirstcontrib-updates' 3c90710c0c Merge branch 'hw/config-doc-in-header' d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code' 5444d52866 Merge branch 'js/vreportf-wo-buffering' 05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add' ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides' 532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default' dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists' fac9ab1419 Merge branch 'ma/bisect-doc-sample-update' a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix' 0be5caf97c Merge branch 'jc/log-graph-simplify' 0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck' 2e697ced9d built-in add -i: offer the `quit` command d7633578b5 built-in add -i: re-implement the `diff` command 8746e07277 built-in add -i: implement the `patch` command ab1e1cccaf built-in add -i: re-implement `add-untracked` in C c54ef5e424 built-in add -i: re-implement `revert` in C a8c45be939 built-in add -i: implement the `update` command f37c226454 built-in add -i: prepare for multi-selection commands c08171d156 built-in add -i: allow filtering the modified files list 0c3944a628 add-interactive: make sure to release `rev.prune_data` 4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance 867fc7f310 grep: don't return an expression from pcre2_free() c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables 72b006f4bf gpg-interface: prefer check_signature() for GPG verification 7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r ccd469450a date.c: switch to reentrant {gm,local}time_r 271c351b2f t7811: don't create unused file 65efb42862 t9300: don't create unused file f6b9413baf sequencer: fix a memory leak in sequencer_continue() 3eae30e464 doc: replace public-inbox links with lore.kernel.org 46c67492aa doc: recommend lore.kernel.org over public-inbox.org 5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects 17a4ae92ea t7700: s/test -f/test_path_is_file/ d2eee32a89 t7700: move keywords onto their own line 7a1c8c2346 t7700: remove spaces after redirect operators 09279086e8 t7700: drop redirections to /dev/null 756ee7fc9f t7501: stop losing return codes of git commands 38c1aa01de t7501: remove spaces after redirect operators 763b47bafa t5703: stop losing return codes of git commands eacaa1c180 t5703: simplify one-time-sed generation logic a29b2429e5 t5317: use ! grep to check for no matching lines 6c37f3ec1b t5317: stop losing return codes of git commands b66e0a1773 t4138: stop losing return codes of git commands afd43c9905 t4015: use test_write_lines() 946d2353a3 t4015: stop losing return codes of git commands 50cd31c652 t3600: comment on inducing SIGPIPE in `git rm` 3b737381d8 t3600: stop losing return codes of git commands 0d913dfa7e t3600: use test_line_count() where possible 29a40b5a67 t3301: stop losing return codes of git commands 9b5a9fa60a t0090: stop losing return codes of git commands 17aa9d9c1a t0014: remove git command upstream of pipe 77a946be98 apply-one-time-sed.sh: modernize style 176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job ed254710ee test: use test_must_be_empty F instead of test_cmp empty F c74b3cbb83 t7812: add missing redirects 213dabf49d test: use test_must_be_empty F instead of test -z $(cat F) c93a5aaec8 t1400: use test_must_be_empty 6e4826ea75 t1410: use test_line_count a5d04a3ef9 t1512: use test_line_count 54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd() 2059e79c0d name-rev: use skip_prefix() instead of starts_with() 1768aaf01d push: use skip_prefix() instead of starts_with() ec6ee0c07a shell: use skip_prefix() instead of starts_with() 7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with() a6293f5d28 fetch: use skip_prefix() instead of starts_with() 13ca8fb79e t5150: skip request-pull test if Perl is disabled ecc0869080 commit-graph: use start_delayed_progress() 44a4693bfc progress: create GIT_PROGRESS_DELAY 528d9e6d01 t/perf: don't depend on Git.pm b8dcc45387 perf-lib: use a single filename for all measurement types fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk' d82dfa7f5b rebase -i: finishing touches to --reset-author-date 1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory 393adf7a6f sequencer: directly call pick_commits() from complete_action() a2dd67f105 rebase: fill `squash_onto' in get_replay_opts() 3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function 34065541e3 sequencer: update `done_nr' when skipping commands in a todo list 8638114e06 sequencer: update `total_nr' when adding an item to a todo list 0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions 9917eca794 l10n: zh_TW: add translation for v2.24.0 0a8e3036a3 reset: parse rev as tree-ish in patch mode f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits 8d483c8408 doc: document 'git submodule status --cached' befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later 9a780a384d mingw: spawned processes need to inherit only standard handles c5a03b1e29 mingw: work around incorrect standard handles eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool 43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values 2d05ef2778 sequencer: fix empty commit check when amending ea8b7be147 git svn: stop using `rebase --preserve-merges` 67a6ea6300 gpg-interface: limit search for primary key fingerprint 392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern cff4e9138d sparse-checkout: check for dirty status 416adc8711 sparse-checkout: update working directory in-process for 'init' f75a69f880 sparse-checkout: cone mode should not interact with .gitignore fb10ca5b54 sparse-checkout: write using lockfile 99dfa6f970 sparse-checkout: use in-process update for disable subcommand e091228e17 sparse-checkout: update working directory in-process e9de487aa3 sparse-checkout: sanitize for nested folders 4dcd4def3c unpack-trees: add progress to clear_ce_flags() eb42feca97 unpack-trees: hash less in cone mode af09ce24a9 sparse-checkout: init and set in cone mode 96cc8ab531 sparse-checkout: use hashmaps for cone patterns 879321eb0b sparse-checkout: add 'cone' mode e6152e35ff trace2: add region in clear_ce_flags 72918c1ad9 sparse-checkout: create 'disable' subcommand 7bffca95ea sparse-checkout: add '--stdin' option to set subcommand f6039a9423 sparse-checkout: 'set' subcommand d89f09c828 clone: add --sparse mode bab3c35908 sparse-checkout: create 'init' subcommand 94c0956b60 sparse-checkout: create builtin with 'list' subcommand 679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files df6d3d6802 lib-bash.sh: move `then` onto its own line 2a02262078 t5520: replace `! git` with `test_must_fail git` c245e58bb6 t5520: remove redundant lines in test cases a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp e959a18ee7 t5520: don't put git in upstream of pipe 5540ed27bc t5520: test single-line files by git with test_cmp dd0f1e767b t5520: use test_cmp_rev where possible 979f8891cc t5520: replace test -{n,z} with test-lib functions 3037d3db90 t5520: use test_line_count where possible 93a9bf876b t5520: remove spaces after redirect operator ceeef863de t5520: replace test -f with test-lib functions 4c8b046f82 t5520: let sed open its own input 53c62b9810 t5520: use sq for test case names e8d1eaf9b4 t5520: improve test style 2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals 8cb7980382 t0000: test multiple local assignment 5b583e6a09 format-patch: pass notes configuration to range-diff bd36191886 range-diff: pass through --notes to `git log` 9f726e1b87 range-diff: output `## Notes ##` header 3bdbdfb7a5 t3206: range-diff compares logs with commit notes 75c5aa0701 t3206: s/expected/expect/ 79f3950d02 t3206: disable parameter substitution in heredoc 3a6e48e9f7 t3206: remove spaces after redirect operators 26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish 077a1fda82 userdiff: support Python async functions 3798149a74 SubmittingPatches: use `--pretty=reference` 1f0fc1db85 pretty: implement 'reference' format 618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type 0df621172d pretty: provide short date format ac52d9410e t4205: cover `git log --reflog -z` blindspot 3e8ed3b93e pretty.c: inline initalize format_context 4982516451 revision: make get_revision_mark() return const pointer f0f9de2bd7 completion: complete `tformat:` pretty format fb2ffa77a6 SubmittingPatches: remove dq from commit reference bae74c9dfb pretty-formats.txt: use generic terms for hash bd00717eab SubmittingPatches: use generic terms for hash 9d45ac4cbf rev-list-options.txt: remove reference to --show-notes 828e829b9e argv-array: add space after `while` e440fc5888 commit: support the --pathspec-from-file option 66a25a7242 doc: commit: synchronize <pathspec> description 64bac8df97 reset: support the `--pathspec-from-file` option d137b50756 doc: reset: synchronize <pathspec> description 24e4750c96 pathspec: add new function to parse file 0dbc4a0edf ci(osx): update homebrew-cask repository with less noise e02058a729 sequencer: handle rebase-merges for "onto" message bae60ba7e9 builtin/unpack-objects.c: show throughput progress 2d92ab32fd rev-parse: make --show-toplevel without a worktree an error 9e5afdf997 fetch: add trace2 instrumentation 4c4066d95d run-command: move doc to run-command.h 6c51cb525d trace2: move doc to trace2.h 7db0305438 parse-options: add link to doc file in parse-options.h d95a77d059 submodule-config: move doc to submodule-config.h f3b9055624 credential: move doc to credential.h bbcfa3002a tree-walk: move doc to tree-walk.h 971b1f24a2 argv-array: move doc to argv-array.h f1ecbe0f53 trace: move doc to trace.h 13aa9c8b70 cache: move doc to cache.h c0be43f898 sigchain: move doc to sigchain.h 19ef3ddd36 pathspec: move doc to pathspec.h 301d595e72 revision: move doc to revision.h 3a1b3415d9 attr: move doc to attr.h 126c1ccefb refs: move doc to refs.h d27eb356bf remote: move doc to remote.h and refspec.h 405c6b1fbc sha1-array: move doc to sha1-array.h d3d7172e40 merge: move doc to ll-merge.h 3f1480b745 graph: move doc to graph.h and graph.c 266f03eccd dir: move doc to dir.h 13c4d7eb22 diff: move doc to diff.h and diffcore.h cd5522271f rebase -r: let `label` generate safer labels 867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()` 8c15904462 built-in add -i: implement the `help` command 3d965c7674 built-in add -i: use color in the main loop 68db1cbf8e built-in add -i: support `?` (prompt help) 76b743234c built-in add -i: show unique prefixes of the commands 6348bfba58 built-in add -i: implement the main loop a376e37b2c gitweb: escape URLs generated by href() b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI f28bceca75 t/gitweb-lib.sh: drop confusing quotes 0eba60c9b7 t9502: pass along all arguments in xss helper 932757b0cc INSTALL: use existing shell scripts as example b018719927 t7004: check existence of correct tag 1daaebcaa5 built-in add -i: color the header in the `status` command 5e82b9e4d2 built-in add -i: implement the `status` command e4cb659ebd diff: export diffstat interface f83dff60a7 Start to implement a built-in version of `git add --interactive` df53c80822 stash: make sure we have a valid index before writing it ad7a403268 send-pack: check remote ref status on pack-objects failure d91ce887c9 t6120-describe: correct test repo history graph in comment 1f9247a3bd completion: tab-complete "git svn --recursive" 603960b50e promisor-remote: remove fetch_if_missing=0 e362fadcd0 clone: remove fetch_if_missing=0 169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL 51bd6be32d mingw: use COPY_ARRAY for copying array 4bd0593e0f test-tool: use 'read-graph' helper e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway d784d978f6 t4215: use helper function to check output 61eea521fe fsmonitor: do not compare bitmap size with size of split index b19f3fe9dd hex: drop sha1_to_hex() c1ce9c06d0 completion: learn to complete `git rebase --onto=` f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase aa6d7f93ed hex: drop sha1_to_hex_r() 52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch 5772b0c745 sequencer: reencode old merge-commit message e0eba649e8 bundle-verify: add --quiet 79862b6b77 bundle-create: progress output control 73c3253d75 bundle: framework for options before bundle file 68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in" b375744274 sequencer: reencode squashing commit's message 019a9d8362 sequencer: reencode revert/cherry-pick's todo list 0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding 1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary d9f6f3b619 The first batch post 2.24 cycle 28014c1084 Merge branch 'bc/hash-independent-tests-part-6' 57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree' c22f63c40f Merge branch 'pb/pretty-email-without-domain-part' 5731ca3657 Merge branch 'hw/remove-api-docs-placeholder' 14b58c62bc Merge branch 'sg/commit-graph-usage-fix' eff313f8a7 Merge branch 'dl/apply-3way-diff3' db806d7064 Merge branch 'sg/dir-trie-fixes' f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix' 8f1119b988 Merge branch 'wb/midx-progress' d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes' 0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges' 8f40d89783 Merge branch 'hv/bitshift-constants-in-blame' d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head' 5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer' b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc' 15d9f3dc66 Merge branch 'es/walken-tutorial' 026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor' ed28358833 convert: use skip_iprefix() in validate_encoding() 89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding() 03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules ae821ffe83 multimail: fix a few simple spelling errors 557c5895c2 sha1dc: fix trivial comment spelling error aa74be316a Fix spelling errors in test commands 96c0caf5e3 Fix spelling errors in messages shown to users 4dc8b1c114 Fix spelling errors in names of tests 7a40cf1553 Fix spelling errors in comments of testcases 15beaaa3d1 Fix spelling errors in code comments a807200f67 userdiff: add Elixir to supported userdiff languages 461caf3e8a git-shortlog.txt: include commit limiting options 6462d5eb9a fetch: remove fetch_if_missing=0 46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion 99b2ba35f5 t0028: eliminate non-standard usage of printf add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` 14c4776d75 t: fix typo in test descriptions 270de6acbe t6024: modernize style 77363a51fb name-hash.c: remove duplicate word in comment c92faa4d22 hashmap: fix documentation misuses of -> versus . a6d39f2efb git-filter-branch.txt: correct argument name typo 4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators 8915297925 Fix spelling errors in documentation outside of Documentation/ 031fd4b93b Documentation: fix a bunch of typos, both old and new dd0b61f577 fsmonitor: fix watchman integration 5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare() 7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph c14e6e7903 fetch: add the command-line option `--write-commit-graph` da72936f54 Git 2.24 1d34d425d4 Merge branch 'bc/doc-use-docbook-5' dac1d83c91 Merge branch 'ds/commit-graph-on-fetch' c32ca691c2 Merge branch 'jt/delay-fetch-if-missing' ab6b50e4c8 Merge https://github.com/prati0100/git-gui 93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2 fe28ad8520 rebase: add --reset-author-date 08187b4cba rebase -i: support --ignore-date 0185c683c9 sequencer: rename amend_author to author_to_rename cbd8db17ac rebase -i: support --committer-date-is-author-date c068bcc59b sequencer: allow callers of read_author_script() to ignore fields ba51d2fb24 rebase -i: add --ignore-whitespace flag 3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower 3ada78de3f myfirstcontrib: add dependency installation step 4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt 4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly 8dfb04ae96 update-index: optionally leave skip-worktree entries alone 116d1fa6c6 vreportf(): avoid relying on stdio buffering efd5444238 RelNotes/2.24.0: fix self-contradictory note 391c7e40b5 fetch.c: fix typo in a warning message 55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template 849e43680d RelNotes/2.24.0: typofix 0115e5d929 git-diff.txt: document return code of `--no-index` 798d66e35d l10n: de.po: Update German translation c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u) f21f8f5d35 Git 2.24-rc2 8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix' 0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix' f2db52c46b Merge branch 'js/mingw-needs-hiding-fix' 5b7594abdc Merge branch 'master' of github.com:vnwildman/git 034d33653a Merge branch 'next' of github.com:ChrisADR/git-po 26b061007c submodule: teach set-url subcommand 460782b7be t7519-status-fsmonitor: improve comments d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses 4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config 1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694) f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0 762d5b4f46 help: add gitsubmodules to the list of guides 76a53d640f git_path(): handle `.lock` files correctly 3ce47211a6 t1400: wrap setup code in test case 44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string 6c02042139 clone: rename static function `dir_exists()`. 8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command 77200e9332 l10n: es: 2.24.0 round 2 e42df36b42 Merge branch 'l10n/it/update-italian-translation' 5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2 51728480fe l10n: fr v2.24.0 rnd2 045a548698 l10n: git.pot: v2.24.0 round 2 (1 new) 468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree() c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit() 103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag() f648ee7088 fsck: rename vague "oid" local variables cc579000bf fsck: don't require an object struct in verify_headers() 7854399366 fsck: don't require an object struct for fsck_ident() b8b00f1693 fsck: drop blob struct from fsck_finish() 6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob() 38370253fd fsck: don't require an object struct for report() f59793763d fsck: only require an oid for skiplist functions 5afc4b1dc6 fsck: only provide oid/type in fsck_error callback 82ef89b318 fsck: don't require object structs for display functions 733902905d fsck: use oids rather than objects for object_name API d40bbc109b fsck_describe_object(): build on our get_object_name() primitive a59cfb3230 fsck: unify object-name code 23a173a761 fsck: require an actual buffer for non-blobs 2175a0c601 fsck: stop checking tag->tagged ec65231571 fsck: stop checking commit->parent counts 1de6007d85 fsck: stop checking commit->tree value 228c78fbd4 commit, tag: don't set parsed bit for parse failures 60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()` 8b656572ca builtin/commit-graph.c: remove subcommand-less usage string fa26d5ede6 t4048: abstract away SHA-1-specific constants cf02be8486 t4045: make hash-size independent 38ee26b2a3 t4044: update test to work with SHA-256 37ab8ebef1 t4039: abstract away SHA-1-specific constants 0370b35414 t4038: abstract away SHA-1 specific constants 0253e126a2 t4034: abstract away SHA-1-specific constants 45e2ef2b1d t4027: make hash-size independent 79b0edc1a0 t4015: abstract away SHA-1-specific constants 840624ff55 t4011: abstract away SHA-1-specific constants 32a6707267 t4010: abstract away SHA-1-specific constants 440bf91dfa t3429: remove SHA1 annotation 0b408ca2bd t1305: avoid comparing extensions 2eabd38313 rev-parse: add a --show-object-format option 52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode 45e206f0d8 t4203: use test-lib.sh definitions 2ae4944aac t6006: use test-lib.sh definitions cb99a34e23 commit-graph: fix writing first commit-graph during fetch e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug 7b4fb434b4 documentation: remove empty doc files 566a1439f6 Git 2.24-rc1 04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix' 4d6fb2beeb Merge branch 'ds/feature-macros' 5f0b6ed907 Merge branch 'js/azure-ci-osx-fix' c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs' 1b4f85285f Merge branch 'dl/submodule-set-branch' c7aadccba0 fetch: delay fetch_if_missing=0 until after config c11e9966cb repo-settings: read an int for index.version 091489d068 apply: respect merge.conflictStyle in --3way aa76ae4905 t4108: demonstrate bug in apply 95806205cd t4108: use `test_config` instead of `git config` b0069684d4 t4108: remove git command upstream of pipe fa87b81385 t4108: replace create_file with test_write_lines 7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job 6c96630cb0 config: move documentation to config.h d81542e6f3 Eleventh batch e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix' d45d771978 Merge branch 'bc/smart-http-atomic-push' 22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix' 2e215b7959 Merge branch 'sb/userdiff-dts' e3cf08361a Merge branch 'sg/progress-fix' b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix' c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc' f45f88b2e4 path.c: don't call the match function without value in trie_find() c72fc40d09 path.c: clarify two field names in 'struct common_dir' 8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file 7cb8c929d7 path.c: clarify trie_find()'s in-code comment e536b1fedf Documentation: mention more worktree-specific exceptions 680cba2c2b multi-pack-index: add [--[no-]progress] option. 64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file 8dc18f8937 midx: add progress to expire_midx_packs 840cef0c70 midx: add progress to write_midx_file efbc3aee08 midx: add MIDX_PROGRESS flag 0eb3671ed9 ci(osx): use new location of the `perforce` cask da1e295e00 t604[236]: do not run setup in separate tests 49b8133a9e merge-recursive: fix merging a subdirectory into the root directory d3eebaad5e merge-recursive: clean up get_renamed_dir_portion() 80736d7c5e doc: am --show-current-patch gives an entire e-mail message a8e2c0eadc t7419: change test_must_fail to ! for grep 19c29e538e t4014: make output-directory tests self-contained 12a4aeaad8 Merge branch 'js/azure-pipelines-msvc' 399c23c046 ci(visual-studio): actually run the tests in parallel 711cd6d15c ci(visual-studio): use strict compile flags, and optimization 370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0 cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master 907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master 13bcea8c7f l10n: fr 2.24.0 rnd 1 135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master 3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) 8da56a4848 userdiff: fix some corner cases in dts regex 86795774bb builtin/blame.c: constants into bit shift format feebd2d256 rebase: hide --preserve-merges option 0e40a73a4c Doc: Bundle file usage 78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error 12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error 2b6f6ea1bd test-progress: fix test failures on big-endian systems f757409e36 l10n: bg.po: Updated Bulgarian translation (4693) 176f5adfdb completion: clarify installation instruction for zsh d966095db0 Git 2.24-rc0 90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array' 3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth' d0258d0944 Merge branch 'rs/http-push-simplify' bb52def6da Merge branch 'jj/stash-reset-only-toplevel' f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs' e5fca6b573 Merge branch 'bb/compat-util-comment-fix' 43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup' 07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely' 2d74d28ee0 Merge branch 'dl/compat-cleanup' 9b83a94829 Merge branch 'ta/t1308-typofix' 376012c919 Merge branch 'js/doc-stash-save' 10da030ab7 grep: avoid leak of chartables in PCRE2 513f2b0bbd grep: make PCRE2 aware of custom allocator 57d4660468 grep: make PCRE1 aware of custom allocator d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand 8af69cf3e2 t3301: test diagnose messages for too few/many paramters 6f1194246a remote-curl: pass on atomic capability to remote side bbb13e8188 graph: fix coloring of octopus dashes 92beecc136 graph: flatten edges that fuse with their right neighbor 479db18bc0 graph: smooth appearance of collapsing edges on commit lines 0195285b95 graph: rename `new_mapping` to `old_mapping` d62893ecc1 graph: commit and post-merge lines for left-skewed merges 0f0f389f12 graph: tidy up display of left-skewed merges 458152cce1 graph: example of graph output that can be simplified ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state 46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()` a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()` 9157a2a032 graph: reuse `find_new_column_by_commit()` 210179a20d graph: handle line padding in `graph_next_line()` fbccf255f9 graph: automatically track display width of graph lines 5374a290aa fetch-pack: write fetched refs to .promisor 4627bc777e sequencer: run post-commit hook 49697cb721 move run_commit_hook() to libgit and use it there 12bb7a540a sequencer.h fix placement of #endif 6a619ca03c t3404: remove uneeded calls to set_fake_editor b2dbacbddf t3404: set $EDITOR in subshell 88a92b6c73 t3404: remove unnecessary subshell bf8e65b30b format-patch: teach --cover-from-description option a92331df18 format-patch: use enum variables 46273df7bf format-patch: replace erroneous and condition 3b3c79f6c9 diff-highlight: fix a whitespace nit 108b97dc37 Ninth batch cbe8cdd3a0 Merge branch 'jk/coc' 3b9ec27919 Merge branch 'js/trace2-fetch-push' c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch' 1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup' eb3de5b823 Merge branch 'js/xdiffi-comment-updates' 4e8371ec26 Merge branch 'dl/t0000-skip-test-test' b6d712fa4e Merge branch 'tg/range-diff-output-update' 77458870a5 Merge branch 'gs/sq-quote-buf-pretty' 5efabc7ed9 Merge branch 'ew/hashmap' d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files' 6ed610b968 Merge branch 'am/t0028-utf16-tests' 5b900fb812 Merge branch 'dl/octopus-graph-bug' 16d9d7184b Merge branch 'en/fast-imexport-nested-tags' 6d5291be45 Merge branch 'js/azure-pipelines-msvc' ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd' d96e31e390 Merge branch 'js/fetch-jobs' 280bd44551 Merge branch 'en/merge-recursive-cleanup' 062a309d36 remote-curl: use argv_array in parse_push() a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes 5cc6a4be11 http-push: simplify deleting a list item 556895d0c8 stash: avoid recursive hard reset on submodules b524f6b399 Merge branch 'ka/japanese-translation' f6f3824b4e git-gui: improve Japanese translation 61f4b407d3 Merge branch 'py/readme' 1e6880fd06 git-gui: add a readme edefc31873 format-patch: create leading components of output directory 68b69211b2 git-compat-util: fix documentation syntax fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth() e0479fa073 documentation: add tutorial for object walking 3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed 4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target 9cad1c4488 pthread.h: manually align parameter lists 8c1cfd58e3 t1308-config-set: fix a test that has a typo 57d8f4b4c7 doc(stash): clarify the description of `save` 08da6496b6 Eighth batch 07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup' f0d407e6ae Merge branch 'kt/add-i-progress' 66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree' a4c5d9f66e Merge branch 'rs/dedup-includes' 159cdabd87 Merge branch 'js/range-diff-noprefix' 93424f1f7d Merge branch 'cb/pcre1-cleanup' a73f91774c Merge branch 'ab/pcre-jit-fixes' 4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword' 020011f2cb Merge branch 'tk/git-svn-trim-author-name' 676278f8ea Merge branch 'bc/object-id-part17' aafb75452b Merge branch 'en/clean-nested-with-ignored' 3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails 5cdf2301d4 add a Code of Conduct document 70bf0b755a Seventh batch 9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat' 2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary' d17f54947d Merge branch 'rs/convert-fix-utf-without-dash' 82c80f98e6 Merge branch 'py/git-gui-has-maintainer' 6e12570822 Merge branch 'ah/cleanups' 772cad0afb Merge branch 'js/diff-rename-force-stable-sort' 424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path' 678a9ca629 Merge branch 'as/shallow-slab-use-fix' 0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix' 042a54d251 Merge branch 'am/visual-studio-config-fix' 03d3b1297c xdiffi: fix typos and touch up comments b05b40930e t0000: cover GIT_SKIP_TESTS blindspots d8bc1a518a send-pack: never fetch when checking exclusions 756fb0dedb t4014: treat rev-list output as the expected value 2b6a9b13ca range-diff: don't segfault with mode-only changes 360c7ba330 transport: push codepath can take arbitrary repository ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments b657047719 merge-recursive: fix the fix to the diff3 common ancestor label b744c3af07 Sixth batch 417056578a Merge branch 'bw/submodule-helper-usage-fix' 9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check' 1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a' 59b19bcd9f Merge branch 'cc/multi-promisor' 1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' 5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort' eb35c18e42 Merge branch 'sg/travis-help-debug' cabb145fe3 Merge branch 'rs/alias-use-copy-array' 56c7ab0f4e Merge branch 'sg/t-helper-gitignore' e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang' 583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules' 337e3f2b49 Merge branch 'rs/nth-switch-code-simplification' 8f53fe1733 Merge branch 'hb/hg-to-git-py3' ef93bfbd45 Merge branch 'sg/progress-fix' 980351d1ac Merge branch 'js/doc-patch-text' 80693e3f09 Merge branch 'tb/commit-graph-harden' ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge' 3f84633563 Merge branch 'dl/cocci-everywhere' caf150ce7d Merge branch 'gs/commit-graph-progress' 1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim' 1398171378 Merge branch 'rs/commit-graph-use-list-count' 773521df26 Merge branch 'rs/nth-parent-parse' 7f17913161 Merge branch 'dl/submodule-set-branch' cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix' bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees' 098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack' 37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc' e392382f95 Merge branch 'dl/complete-rebase-and-archive' cda8faa37e Merge branch 'jk/commit-graph-cleanup' 36d2fca82b Merge branch 'ss/get-time-cleanup' ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude' ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob' ba2d451122 Merge branch 'tg/stash-refresh-index' e2b5038d87 hashmap_entry: remove first member requirement from docs 404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry 23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators c8e424c9c9 hashmap: introduce hashmap_free_entries 8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry * 87571c3f71 hashmap: use *_entry APIs for iteration 939af16eac hashmap_cmp_fn takes hashmap_entry params f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *" f0e63c4113 hashmap: use *_entry APIs to wrap container_of 6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *" 973d5eea74 introduce container_of macro 26b455f21e hashmap_put takes "struct hashmap_entry *" 28ee794128 hashmap_remove takes "const struct hashmap_entry *" b6c5241606 hashmap_get takes "const struct hashmap_entry *" b94e5c1df6 hashmap_add takes "struct hashmap_entry *" f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *" d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *" d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry 12878c8351 coccicheck: detect hashmap_entry.hash assignment e010a41216 diff: use hashmap_entry_init on moved_entry.ent f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo" de5abb5f7a git-p4: auto-delete named temporary file c90b652afd Fifth batch f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1' b0f8aed48f Merge branch 'ma/user-manual-markup-update' faf5576a8d Merge branch 'bc/doc-use-docbook-5' 314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes' 70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo' 847650798b Merge branch 'am/mailmap-andrey-mazo' 1a155f2e66 Merge branch 'jc/git-gui-has-maintainer' 1bcef51204 t/oid-info: add empty tree and empty blob values ecde49bb8a t/oid-info: allow looking up hash algorithm name 11a3d3aadd git-rev-list.txt: prune options in synopsis 7d2f003ee4 Documentation: update the location of the git-gui repo b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding() 46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines b35304bf95 ci: really use shallow clones on Azure Pipelines ab7d854aba tests: let --immediate and --write-junit-xml play well together be5d88e112 test-tool run-command: learn to run (parts of) the testsuite 5d65ad17a9 vcxproj: include more generated files 030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built 61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable() e4347c9434 msvc: handle DEVELOPER=1 ed712ef8d5 msvc: ignore some libraries when linking 5b8f9e2417 compat/win32/path-utils.h: add #include guards 41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning c097b95a26 msvc: avoid using minus operator on unsigned types dfd557c978 stash apply: report status correctly even in a worktree's subdirectory d54dea77db fetch: let --jobs=<n> parallelize --multiple, too 87db61a436 trace2: write discard message to sentinel files 83e57b04e6 trace2: discard new traces if target directory has too many files 11c21f22de t4214: demonstrate octopus graph coloring failure 25eb905e14 t4214: explicitly list tags in log 63be8c8dd7 t4214: generate expect in their own test cases a7a5590c6e t4214: use test_merge 94ba151300 test-lib: let test_merge() perform octopus merges 22541013d0 docs: clarify trace2 version invariants 3d4548e7e2 docs: mention trace2 target-dir mode in git-config 2fe44394c8 treewide: remove duplicate #include directives dbcd970c27 push: do not pretend to return `int` from `die_push_simple()` 941790d7de fast-export: handle nested tags 8d7d33c1ce t9350: add tests for tags of things other than a commit a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags 208d69246e fast-export: add support for --import-marks-if-exists b8f50e5b60 fast-import: add support for new 'alias' command f73b2aba05 fast-import: allow tags to be identified by mark labels 3164e6bd24 fast-import: fix handling of deleted tags 8085050ab4 add -i: show progress counter in the prompt 69fdb922ad Merge branch 'bw/diff3-conflict-style' b436825b9b git-gui: support for diff3 conflict style 937b76ed49 range-diff: internally force `diff.noprefix=true` 411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job 25e4b8099c push: add trace2 instrumentation 5fc31180d8 fetch: add trace2 instrumentation 53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value c3b57dc2a0 git-gui: use existing interface to query a path's attribute 45ab460d4a Merge branch 'js/git-bash-if-available' 0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command 71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only) 54a80a9ad8 wrapper: use a loop instead of repetitive statements baed6bbb5b diffcore-break: use a goto instead of a redundant if statement 8da02ce62a commit-graph: remove a duplicate assignment ddb3c856f3 shallow.c: don't free unallocated slabs 8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits 65904b8b2b promisor-remote: skip move_to_tail when no-op 2049b8dc65 diffcore_rename(): use a stable sort 97fff61012 Move git_sort(), a stable sort, into into libgit.a 69f272b922 dir: special case check for the possibility that pathspec is NULL 6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available bc12974a89 Fourth batch 5a5350940b Merge branch 'ds/commit-graph-on-fetch' 974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch' 9755f70fe6 Merge branch 'ds/include-exclude' 93fc8760e7 Merge branch 'jh/trace2-pretty-output' 640f9cd599 Merge branch 'dl/rebase-i-keep-base' 026428c35e Merge branch 'sg/clean-nested-repo-with-ignored' 21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip' d693345518 Merge branch 'dl/use-sq-from-test-lib' d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes' 2be6ccc01a Merge branch 'sg/git-test-boolean' cf861cd7a0 Merge branch 'rs/get-tagged-oid' 91243b019d Merge branch 'en/filter-branch-deprecation' 9bc67b6658 Merge branch 'en/merge-options-ff-and-friends' fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden' cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option' 8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return' 3ff6af7753 Merge branch 'nd/switch-and-restore' aadac067aa Merge branch 'tb/file-url-to-unc-path' b57a88a5f1 Merge branch 'js/gitdir-at-unc-root' 6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path' 430439536b Merge branch 'rs/parse-tree-indirect' 991fd97b9a Merge branch 'jk/fast-import-history-bugfix' 74a39b9bcc Merge branch 'mh/notes-duplicate-entries' 37801f0665 Merge branch 'tb/banned-vsprintf-namefix' 21ce0b48f3 Merge branch 'mh/release-commit-memory-fix' f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup' bf6136cab8 Merge branch 'rs/strbuf-detach' a2e22bb3ad Merge branch 'rs/trace2-dst-warning' 1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup' 0281733483 Merge branch 'bc/hash-independent-tests-part-5' f06fb376ed Merge branch 'jc/test-cleanup' 00bb74453d Merge branch 'dl/compat-cleanup' 59438be06c Merge branch 'js/visual-studio' cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone' af2abd870b fast-export: fix exporting a tag and nothing else c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit fd5b820d9c user-manual.txt: change header notation e79b34533a user-manual.txt: add missing section label b503a2d515 Makefile: emulate compile in $(HCO) target better af26e2a9d2 pack-bitmap.h: remove magic number b06fdead04 promisor-remote.h: include missing header 97b989ee3a apply.h: include missing header 4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name d928a8388a t0028: add more tests 0b63fd6965 t0028: fix test for UTF-16-LE-BOM fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration 2e09c01232 name-rev: avoid cutoff timestamp underflow 8464f94aeb promisor-remote.h: drop extern from function declaration 75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp 24c681794f doc: MyFirstContribution: fix cmd placement instructions c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode 60c60b627e Merge branch 'py/git-git-extra-stuff' faf420e05a treewide: correct several "up-to-date" to "up to date" b71c6c3b64 Fix build with core.autocrlf=true 16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff 26e3d1cbea .mailmap: update email address of Andrey Mazo 27ea41c0b4 t/helper: ignore only executable files 7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias() 83e3ad3b12 merge-recursive: symlink's descendants not in way 34933d0eff stash: make sure to write refreshed cache e080b34540 merge: use refresh_and_write_cache 22184497a3 factor out refresh_and_write_cache function 7371612255 commit-graph: add --[no-]progress to write and verify 47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW 253bfe49bd SubmittingPatches: git-gui has a new maintainer d17ae00c97 hg-to-git: make it compatible with both python3 and python2 4c86140027 Third batch f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http' 627b826834 Merge branch 'md/list-objects-filter-combo' b9ac6c59b8 Merge branch 'cc/multi-promisor' de67293e74 Merge branch 'sg/line-log-tree-diff-optim' 95486229e3 Merge branch 'sg/complete-configuration-variables' f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook' a2e524ecf3 Merge branch 'cb/curl-use-xmalloc' 128666753b Merge branch 'jk/drop-release-pack-memory' 917a319ea5 Merge branch 'js/rebase-r-strategy' 7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui 4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout() 0d4304c124 doc: fix reference to --ignore-submodules af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py 8a3a6817e2 Merge gitk to pick up emergency build fix 2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po 9027af58e2 Makefile: run coccicheck on more source files 43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES) 5dedf7de53 Makefile: define THIRD_PARTY_SOURCES 902b90cf42 clean: fix theoretical path corruption ca8b5390db clean: rewrap overly long line 09487f2cba clean: avoid removing untracked files in a nested git repository e86bbcf987 clean: disambiguate the definition of -d 3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run 29b577b960 dir: add commentary explaining match_pathspec_item's return value 89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case 404ebceda0 dir: also check directories for matching pathspecs a5e916c745 dir: fix off-by-one error in match_pathspec_item bbbb6b0b89 dir: fix typo in comment 7541cc5302 t7300: add testcases showing failure to clean specified pathspecs 0eb7c37a8a diff, log doc: small grammer, format, and language fixes 6fae6bd518 diff, log doc: say "patch text" instead of "patches" 2bb74b53a4 Test the progress display bbf47568ad Revert "progress: use term_clear_line()" cf6a2d2557 Makefile: strip leading ./ in $(LIB_H) b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup 689a146c91 commit-graph: use commit_list_count() 59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N" a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N" a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base" cf34337f98 list-objects-filter: give a more specific error sparse parsing error 4c96a77594 list-objects-filter: delay parsing of sparse oid 72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter 83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer 7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>` 226daba280 Doc/Makefile: give mansource/-version/-manual attributes 40e747e89d git-submodule.txt: fix AsciiDoc formatting error f6461b82b9 Documentation: fix build with Asciidoctor 2 3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk f7a8834ba4 Merge branch 'bp/amend-toggle-bind' ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit" 9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog beffae768a gitk: Add Chinese (zh_CN) translation 56d9cbe68b packfile: expose get_delta_base() bab28d9f97 builtin/pack-objects: report reused packfile objects 6c8ec8c30a Merge branch 'bw/commit-scrollbuffer' acfa495519 Merge branch 'bw/amend-checkbutton' da08d559b7 git-gui: add horizontal scrollbar to commit buffer ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton aeeb978ba6 completion: teach archive to use __gitcomp_builtin 2b9bd488ae completion: teach rebase to use __gitcomp_builtin d49dffde9a completion: add missing completions for log, diff, show 6abada1880 upload-pack: disable commit graph more gently for shallow traversal fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time 72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set 4fd39c76e6 doc: minor formatting fix 29f4332e66 Quit passing 'now' to date code c77abf0460 Merge branch 'py/revert-hunks-lines' 5a2bb62180 Merge branch 'bp/widget-focus-hotkeys' e07446ed5f git-gui: add hotkeys to set widget focus f981ec18cf cache-tree: do not lazy-fetch tentative tree f1d4a28250 Second batch c8ada15456 Merge branch 'bc/reread-attributes-during-rebase' 8f3ba423e7 Merge branch 'tg/t0021-racefix' a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email' d49c2c3466 Merge branch 'sb/userdiff-dts' 2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe' 4c49dd042d Merge branch 'nd/diff-parseopt' d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix' 8ce8a63b46 Merge branch 'ds/midx-expire-repack' 9437394661 Merge branch 'cb/fetch-set-upstream' af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix' fa9e7934c7 Merge branch 'bm/repository-layout-typofix' d1a251a1fa Merge branch 'en/checkout-mismerge-fix' e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental' f4f8dfe127 Merge branch 'ds/feature-macros' 4a12f89865 Merge branch 'jk/eoo' b4a1eec332 Merge branch 'jk/repo-init-cleanup' 70336bd50a Merge branch 'py/git-gui-do-quit' ad7c543e3b grep: skip UTF8 checks explicitly 0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration() b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration 4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor b7e1ba5649 git-merge-index.txt: wrap shell listing in "----" 38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----" 5371813768 git-ls-remote.txt: wrap shell listing in "----" 1925fe0c8a Documentation: wrap config listings in "----" 922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor 2017956a19 Documentation: wrap blocks with "--" dd2e50a84e commit-graph: turn off save_commit_buffer 67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits 806278dead commit-graph.c: handle corrupt/missing trees 16749b8dd2 commit-graph.c: handle commit parsing errors 23424ea759 t/t5318: introduce failing 'git commit-graph write' tests bf1e28e0ad builtin/rebase.c: Remove pointless message d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing bd482d6e33 t: use common $SQ variable 3a37876b5d pack-objects: drop packlist index_pos optimization 7e6b96c73b test-read-cache: drop namelen variable e4b369069e diff-delta: set size out-parameter to 0 for NULL delta 7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint f1cbd033e2 pack-objects: use object_id in packlist_alloc() 0dfed92dfd git-am: handle missing "author" when parsing commit 3960290675 ci: restore running httpd tests 6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests c77722b3ea use get_tagged_oid() dad3f0607b tag: factor out get_tagged_oid() 468ce99b77 unpack-trees: rename 'is_excluded_from_list()' 65edd96aec treewide: rename 'exclude' methods to 'pattern' 4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_' caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list' ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern' 483e861111 t9902: use a non-deprecated command for testing 9df53c5de6 Recommend git-filter-repo instead of git-filter-branch 7b6ad97939 t6006: simplify, fix, and optimize empty message test 50094ca45f config/format.txt: specify default value of format.coverLetter c1a6f21cd4 Doc: add more detail for git-format-patch 854b5cb46a t4014: stop losing return codes of git commands dd2b6b6860 t4014: remove confusing pipe in check_threading() 6bd26f58ea t4014: use test_line_count() where possible c6ec6dadba t4014: let sed open its own files f2e2fa8f60 t4014: drop redirections to /dev/null 460609cbd5 t4014: use indentable here-docs 92014b69bb t4014: remove spaces after redirect operators 0ab74e979c t4014: use sq for test case names cb46c40662 t4014: move closing sq onto its own line b562a54c01 t4014: s/expected/expect/ e770fbfeff t3005: remove unused variable da280f5f1a t: use LF variable defined in the test harness 7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch 552fc5016f mingw: apply array.cocci rule 476998d05b t3427: accelerate this test by using fast-export and fast-import aac6ff7b5b .gitignore: stop ignoring `.manifest` files 2c65d90f75 am: reload .gitattributes after patching it 1577dc0f7c tree: simplify parse_tree_indirect() 50f26bd035 fetch: add fetch.writeCommitGraph config setting 8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set 27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options 0a8bc7068f clarify documentation for remote helpers 80e3658647 help: make help_unknown_ref() NORETURN 313677627a checkout: add simple check for 'git checkout -b' 3441de5b9c gitk: Make web links clickable a4fa2f0a4c git-gui: allow undoing last revert 414d924beb rebase: teach rebase --keep-base 6330209d7d rebase tests: test linear branch topology 4effc5bc96 rebase: fast-forward --fork-point in more cases c0efb4c1dd rebase: fast-forward --onto in more cases 2b318aa6c3 rebase: refactor can_fast_forward into goto tower c9efc21683 t3432: test for --no-ff's interaction with fast-forward 1ebec8dfc1 fast-import: duplicate into history rather than passing ownership 9756082b3c fast-import: duplicate parsed encoding string 86ae43da6a status: mention --skip for revert and cherry-pick b1b16bba96 completion: add --skip for cherry-pick and revert deaa65a754 completion: merge options for cherry-pick and revert 4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests 793ac7e309 t3432: test rebase fast-forward behavior 359ecebc34 t3431: add rebase --fork-point tests 502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage ff61681b46 grep: refactor and simplify PCRE1 support 8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1 1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning() fd99c2dd9b grep: use return value of strbuf_detach() 82f51af345 log-tree: always use return value of strbuf_detach() 7e92756751 http: don't leak urlmatch_config.vars 9784f97321 commit: free the right buffer in release_commit_memory ce17feb1b3 path: add a function to check for path suffix 60d198d022 banned.h: fix vsprintf()'s ban message 60fe477a0b notes: avoid potential use-after-free during insertion 779ad6641b notes: avoid leaking duplicate entries 4e1a641ee3 mingw: fix launching of externals from Unicode paths 5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly e2683d51d9 Fix .git/ discovery at the root of UNC shares d17f2124a7 setup_git_directory(): handle UNC paths correctly ebb8d2c90f mingw: support UNC in git clone file://server/share/repo 0c37c41d13 t4009: make hash size independent c1f3dfcc23 t4002: make hash independent 8cc5ff83c3 t4000: make hash size independent c784815073 t3903: abstract away SHA-1-specific constants 2ccdfb1c78 git-gui: return early when patch fails to apply 62bd99934b git-gui: allow reverting selected hunk 5f0a516de9 git-gui: allow reverting selected lines fddf2ebe38 transport: teach all vtables to allow fetch first ac3fda82bf transport-helper: skip ls-refs if unnecessary 745f681289 First batch after Git 2.23 d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg' 22e86e85cb Merge branch 'en/fast-import-merge-doc' 9c7573581c Merge branch 'jk/perf-no-dups' 4336fdb2ef Merge branch 'rs/nedalloc-fixlets' 8ae7a46c4d Merge branch 'sg/show-failed-test-names' 6ba06b582b Merge branch 'sg/commit-graph-validate' 072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix' 207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix' 77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests' 1b01cdbf2e Merge branch 'jk/tree-walk-overflow' 8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix' 307179732d Merge branch 'mt/grep-submodules-working-tree' 58166c2e9d t0021: make sure clean filter runs 8b3f33ef11 ref-filter: initialize empty name or email fields 3c81760bc6 userdiff: add a builtin pattern for dts files fe49814409 t4014: drop unnecessary blank lines from test cases a2bb801f6a line-log: avoid unnecessary full tree diffs eef5204190 line-log: extract pathspec parsing from line ranges into a helper function a63694f523 diff: skip GITLINK when lazy fetching missing objs 7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe 19800bdc3f parseopt: move definition of enum parse_opt_result up 415b770b88 packfile.h: drop extern from function declaration acb49d1cc8 t3800: make hash-size independent ca6ba94200 t3600: make hash size independent 19ce5496c2 t3506: make hash independent 9a6738c061 t3430: avoid hard-coded object IDs 4dd1b5f90f t3404: abstract away SHA-1-specific constants b99bfc7a6c t3306: abstract away SHA-1-specific constants e3e9d02e35 t3305: make hash size independent b408cf8cf6 t3301: abstract away SHA-1-specific constants b561edd213 t3206: abstract away hash size constants a5f61c7d13 t3201: abstract away SHA-1-specific constants 1c24a54ea4 repository-layout.txt: correct pluralization of 'object' b0a3186140 sequencer: simplify root commit creation a47ba3c777 rebase -i: check for updated todo after squash and reword 450efe2d53 rebase -i: always update HEAD before rewording c581e4a749 grep: under --debug, show whether PCRE JIT is enabled aaa95dfa05 midx: switch to using the_hash_algo be8e172e9f builtin/show-index: replace sha1_to_hex 3f34d70d40 rerere: replace sha1_to_hex fc06be3b7f builtin/receive-pack: replace sha1_to_hex 69fa337060 builtin/index-pack: replace sha1_to_hex 3a4d7aa5ae packfile: replace sha1_to_hex e0cb7cdb89 wt-status: convert struct wt_status to object_id 8d4d86b0f0 cache: remove null_sha1 f6ca67d673 builtin/worktree: switch null_sha1 to null_oid dd336a5511 builtin/repack: write object IDs of the proper length 894c0f66bb pack-write: use hash_to_hex when writing checksums 4439c7a360 sequencer: convert to use the_hash_algo 95518faac1 bisect: switch to using the_hash_algo e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo fe9fec45f6 config: use the_hash_algo in abbrev comparison 976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo 703d2d4193 bundle: switch to use the_hash_algo 9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo 7962e046ff show-index: switch hard-coded constants to the_hash_algo fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ 7e0d029f18 builtin/rev-parse: switch to use the_hash_algo 319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo f6af19a9ad fetch-pack: use parse_oid_hex 36261e42ec patch-id: convert to use the_hash_algo 28ba1830d0 builtin/replace: make hash size independent 24bc1a1292 pull, fetch: add --set-upstream option 71d41ff651 archive-tar: turn length miscalculation warning into BUG 17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header() 82a46af13e archive-tar: fix pax extended header length calculation 4060c1990a archive-tar: report wrong pax extended header length 4615a8cb5b merge-recursive: alphabetize include list 45ef16f77a merge-recursive: add sanity checks for relevant merge_options f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* 5bf7e5779e merge-recursive: split internal fields into a separate struct e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output a779fb829b merge-recursive: comment and reorder the merge_options fields 8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options 7c0a6c8e47 merge-recursive: move some definitions around to clean up the header c749ab1da8 merge-recursive: rename merge_options argument to opt in header bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list 4d7101e25c merge-recursive: fix some overly long lines 724dd767b2 cache-tree: share code between functions writing an index as a tree 345480d1ed merge-recursive: don't force external callers to do our logging b4db8a2b76 merge-recursive: remove useless parameter in merge_trees() 98a1d3d888 merge-recursive: exit early if index != head 9822175d2b Ensure index matches head before invoking merge machinery, round N 10f751c06b merge-recursive: remove another implicit dependency on the_repository f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks 8e01251694 merge-recursive: introduce an enum for detect_directory_renames values 743474cbfa merge-recursive: provide a better label for diff3 common ancestor 51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u) 5bace62582 l10n: Update Catalan translation 139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees() 65c01c6442 checkout: provide better conflict hunk description with detached HEAD d8523ca1b9 merge-recursive: be consistent with assert acb7da05ac checkout: remove duplicate code 93b980e58f http: use xmalloc with cURL 64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental aaf633c2ad repo-settings: create feature.experimental setting c6cc4c5afd repo-settings: create feature.manyFiles setting ad0fb65999 repo-settings: parse core.untrackedCache 31b1de6a09 commit-graph: turn on commit-graph by default b068d9a250 t6501: use 'git gc' in quiet mode 7211b9e753 repo-settings: consolidate some config settings 507e5470a0 worktree remove: clarify error message on dirty worktree 5af9d5f6c8 completion: complete config variables and values for 'git clone --config=' 88cd790d6a completion: complete config variables names and values for 'git clone -c' dd33472831 completion: complete values of configuration variables after 'git -c var=' e1e00089da completion: complete configuration sections and variable names for 'git -c' 42d0efec59 completion: split _git_config() d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp() 2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names d9438873c4 completion: deduplicate configuration sections 7a09a8f093 completion: add tests for 'git config' completion 840d7e5b3c completion: complete more values of more 'color.*' configuration variables 08a12175d8 completion: fix a typo in a comment 9827d4c185 packfile: drop release_pack_memory() d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed 362f8b280c t/perf: rename duplicate-numbered test script 742ed63345 trace2: cleanup whitespace in perf format e34430556c trace2: cleanup whitespace in normal format c2b890aca5 quote: add sq_append_quote_argv_pretty() ad43e37839 trace2: trim trailing whitespace in normal format error message 04f10d332f trace2: remove dead code in maybe_add_string_va() da4589ce7e trace2: trim whitespace in region messages in perf target format 0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit 5440eb0ea2 git-gui: call do_quit before destroying the main window bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook 6098817fd7 git-merge: honor pre-merge-commit hook a1f3dd7eb3 merge: do no-verify like commit f78f6c7e0c t7503: verify proper hook execution 70597e8386 nedmalloc: avoid compiler warning about unused value c9b9c09dae nedmalloc: do assignments only after the declaration section 22932d9169 config: stop checking whether the_repository is NULL 5732f2b1ef common-main: delay trace2 initialization 58ebccb478 t1309: use short branch name in includeIf.onbranch test 67feca3b1c gitcli: document --end-of-options 51b4594b40 parse-options: allow --end-of-options as a synonym for "--" 19e8789b23 revision: allow --end-of-options to end option parsing ffe1afe67c tests: show the test name and number at the start of verbose output 96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests 7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits' 39d8831856 commit-graph: turn a group of write-related macro flags into an enum 9916073be5 t5318-commit-graph: use 'test_expect_code' 620c09e1b6 restore: add test for deleted ita files ecd72042de checkout.c: unstage empty deleted ita files a613d4f817 pack-refs: always refresh after taking the lock file decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd' 371df1bea9 trace2: cleanup column alignment in perf target format 5aa02f9868 tree-walk: harden make_traverse_path() length computations c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path() b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len() 37806080d7 tree-walk: use size_t consistently 7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh' 12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh' 9055384710 tree-walk: drop oid from traverse_info 947208b725 setup_traverse_info(): stop copying oid e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` a63f990d92 t3418: test `rebase -r` with merge strategies 5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges` e145d99347 rebase -r: support merge strategies other than `recursive` 4e6023b13a t3427: fix another incorrect assumption f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced a9c71073da t3427: fix erroneous assumption b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case c248d32cdb t3427: simplify the `setup` test case significantly 8c1e24048a t3427: add a clarifying comment 5efed0ecf9 rebase: fold git-rebase--common into the -p backend 68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone 2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive` 6180b20239 t3400: stop referring to the scripted rebase d5b581f228 Drop unused git-rebase--am.sh 814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation 6a289d45c0 grep: fix worktree case in submodules 870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching 8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data 09872f6418 grep: create a "is_fixed" member in "grep_pat" 8a35b540a9 grep: consistently use "p->fixed" in compile_regexp() 685668faaa grep: stop using a custom JIT stack with PCRE v1 34489239d0 grep: stop "using" a custom JIT stack with PCRE v2 04bef50c01 grep: remove overly paranoid BUG(...) code b65abcafc7 grep: use PCRE v2 for optimized fixed-string search 48de2a768c grep: remove the kwset optimization 45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern> 25754125ce grep: make the behavior for NUL-byte in patterns sane d316af059d grep tests: move binary pattern tests into their own file 471dac5d2c grep tests: move "grep binary" alongside the rest f463beb805 grep: inline the return value of a function call used only once b14cf112e2 t4210: skip more command-line encoding tests on MinGW 44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>" 4e2443b181 log tests: test regex backends in "--encode=<enc>" tests 90d21f9ebf list-objects-filter-options: make parser void 5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW 489fc9ee71 list-objects-filter-options: allow mult. --filter c2694952e3 strbuf: give URL-encoding API a char predicate fn cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list f56f764279 list-objects-filter-options: move error check up e987df5fe6 list-objects-filter: implement composite filters 842b00516a list-objects-filter-options: always supply *errbuf 7a7c7f4a6d list-objects-filter: put omits set in filter struct 9430147ca0 list-objects-filter: encapsulate filter components 4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c 60b7a92d84 Move repository_format_partial_clone to promisor-remote.c db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} 75de085211 remote: add promisor and partial clone config to the doc 7e154badc0 partial-clone: add multiple remotes in the doc 9a4c507886 t0410: test fetching from many promisor remotes 5e46139376 builtin/fetch: remove unique promisor remote limitation fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote() faf2abf496 promisor-remote: use repository_format_partial_clone 9cfebc1f3b promisor-remote: add promisor_remote_reinit() 9e27beaa23 promisor-remote: implement promisor_remote_get_direct() 48de315817 Add initial support for many promisor remotes 2e860675b6 fetch-object: make functions return an error code c59c7c879e t0410: remove pipes after git commands git-subtree-dir: third_party/git git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui"
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96 af6b65d45e Git 2.26.2 7397ca3373 Git 2.25.4 b86a4be245 Git 2.24.3 f2771efd07 Git 2.23.3 c9808fa014 Git 2.22.4 9206d27eb5 Git 2.21.3 041bc65923 Git 2.20.4 76b54ee9b9 Git 2.19.5 ba6f0905fd Git 2.18.4 df5be6dc3f Git 2.17.5 1a3609e402 fsck: reject URL with empty host in .gitmodules e7fab62b73 credential: treat URL with empty scheme as invalid c44088ecc4 credential: treat URL without scheme as invalid fe29a9b7b0 credential: die() when parsing invalid urls a2b26ffb1a fsck: convert gitmodules url to URL passed to curl 8ba8ed568e credential: refuse to operate when missing host or protocol 24036686c4 credential: parse URL without host as empty host, not unset 73aafe9bc2 t0300: use more realistic inputs a88dbd2f8c t0300: make "quit" helper more realistic de49261b05 Git 2.26.1 274b9cc253 Git 2.26 55a7568606 Merge branch 'en/rebase-backend' c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git 1557364fb4 l10n: tr.po: change file mode to 644 2da1b05674 t3419: prevent failure when run with EXPENSIVE 1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0 5804c6ec40 l10n: de.po: add missing space 98cedd0233 Merge https://github.com/prati0100/git-gui 4914ba4bcf l10n: tr: Fix a couple of ambiguities a5728022e0 Merge branch 'py/remove-tcloo' 7fcb965970 RelNotes/2.26.0: fix various typos f0c03bcf95 l10n: Update Catalan translation 67b0a24910 Git 2.25.3 be8661a328 Sync with Git 2.25.2 0822e66b5d Git 2.25.2 65588b0b2e unicode: update the width tables to Unicode 13.0 7be274b0ff Merge branch 'js/ci-windows-update' into maint 9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint 221887a492 Merge branch 'jk/doc-credential-helper' into maint 32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint 618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint 50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint 41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint 2d7247af6f Merge branch 'am/mingw-poll-fix' into maint 4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint 76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint 569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint 16a4bf1035 Merge branch 'en/check-ignore' into maint 3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint 56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint 1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint 7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint 93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint 758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint 506223f9c5 Git 2.24.2 17a02783d8 Git 2.23.2 69fab82147 Git 2.22.3 fe22686494 Git 2.21.2 d1259ce117 Git 2.20.3 a5979d7009 Git 2.19.4 21a3e5016b Git 2.18.3 c42c0f1297 Git 2.17.4 d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u) 3891a84ccd git-gui: create a new namespace for chord script evaluation 8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5 440e7442d1 l10n: zh_CN: Revise v2.26.0 translation 2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 6c85aac65f Git 2.26-rc2 74f172e39e Merge branch 'en/test-cleanup' e96327c947 Merge branch 'es/outside-repo-errmsg-hints' ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 15fa8d9667 l10n: vi: fix translation + grammar 5c20398699 prefix_path: show gitdir if worktree unavailable 1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) a4a2f64642 Merge branch 'js/askpass-coerce-utf8' 850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows d769dcc5cd Merge branch 'py/blame-status-error' 70e24186c0 t6022, t6046: fix flaky files-are-updated checks 30e9940356 Hopefully the final batch before -rc2 b4f0038525 Merge branch 'en/rebase-backend' 25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master 07259e74ec fsck: detect gitmodules URLs with embedded newlines c716fe4bd9 credential: detect unrepresentable values when parsing urls 17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr 9a6bbee800 credential: avoid writing values with newlines 17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2 1afe18a3bb l10n: es: 2.26.0 round#2 5ab9217a3c Merge branch of github.com:alshopov/git-po into master c6713676d6 Merge branch of github.com:bitigchi/git-po into master b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t) 2713dec02d l10n: tr: v2.26.0 round 2 c9ef57cc3a l10n: fr : v2.26.0 rnd 2 120b1eb731 git-rebase.txt: highlight backend differences with commit rewording 9a1b7474d6 sequencer: clear state upon dropping a become-empty commit 937d143630 i18n: unmark a message in rebase.c a56d361f66 Merge branch 'ds/sparse-add' 5fa9169ced Merge branch 'dr/push-remote-ref-update' cdef998b46 Merge branch 'jc/doc-single-h-is-for-help' 051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) 52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master 9643441983 l10n: tr: Add glossary for Turkish translations 438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git 2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u) dd2c269652 l10n: tr: Add Turkish translations 8f4f099f8b l10n: tr: Add Turkish translation team info b4374e96c8 Git 2.26-rc1 4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch' 3658d77f8e Merge branch 'hd/show-one-mergetag-fix' 6125104b88 Merge branch 'rt/format-zero-length-fix' 1ac37deba2 Merge branch 'am/mingw-poll-fix' cf372dc815 Merge branch 'en/test-cleanup' d1075adfdf Merge branch 'en/merge-path-collision' a4fd114ffc Merge branch 'kk/complete-diff-color-moved' a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file' 0e0d717537 Merge branch 'pb/am-show-current-patch' 9b7f726dfc Merge branch 'am/pathspec-f-f-more' 4605a73073 t1091: don't grep for `strerror()` string 4d9c2902a1 l10n: fr v2.26.0 rnd1 ad182bee3f Merge branch of github.com:alshopov/git-po into master 23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1 98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t) f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed) 76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po 076cbdcd73 Git 2.26-rc0 0d65f3fb1a t5537: adjust test_oid label e63cefb024 Merge branch 'hi/gpg-use-check-signature' 5da7329e29 Merge branch 'rs/commit-graph-code-simplification' 0108fc1b46 Merge branch 'js/ci-windows-update' f3ccd9f0d9 Merge branch 'be/describe-multiroot' a6b4709302 Merge branch 'ag/rebase-remove-redundant-code' b22db265d6 Merge branch 'es/recursive-single-branch-clone' e8e71848ea Merge branch 'jk/nth-packed-object-id' a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch' 4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere' 49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix' 2cbb058669 Merge branch 'bc/wildcard-credential' 25063e2530 Merge branch 'mr/bisect-in-c-1' f4d7dfce4d Merge branch 'ds/sparse-add' 4d864895a2 t2402: test worktree path when called in .git directory af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch() 7655b4119d remote-curl: show progress for fetches over dumb HTTP 2f268890c2 The eighth batch for 2.26 aa5a7e02ad Merge branch 'ma/test-cleanup' 58595e713c Merge branch 'rs/blame-typefix-for-fingerprint' ff41848e99 Merge branch 'rs/micro-cleanups' 4cbf1a0e22 Merge branch 'es/worktree-cleanup' 46703057c1 Merge branch 'ak/test-log-graph' 777815f5f9 Merge branch 'jk/run-command-formatfix' 444cff61b4 Merge branch 'ds/partial-clone-fixes' 48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure' 8c22bd9ff9 Merge branch 'en/rebase-backend' cb2f5a8e97 Merge branch 'en/check-ignore' 0df82d99da Merge branch 'jk/object-filter-with-bitmap' 80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix' 29b09c518c Merge branch 'jk/doc-diff-parallel' 237a28173f show_one_mergetag: print non-parent in hex form. 5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context" 6d1210e133 l10n: Update Catalan translation 0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification" 7329d94be7 config.mak.dev: re-enable -Wformat-zero-length 7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings 94f4d01932 mingw: workaround for hangs when sending STDIN 1ff466c018 Documentation: clarify that `-h` alone stands for `help` 65bf820d0e t6020: new test with interleaved lexicographic ordering of directories 9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it d5bb92eced t3035: prefer test_must_fail to bash negation for git commands b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions 42d180dd01 t602[1236], t6034: modernize test formatting 802050400a merge-recursive: apply collision handling unification to recursive case 7f487ce062 Azure Pipeline: switch to the latest agent pools 5ed9fc3fc8 ci: prevent `perforce` from being quarantined eafff6e41e t/lib-httpd: avoid using macOS' sed d68ce906c7 commit-graph: use progress title directly 30b1c7ad9d describe: don't abort too early when searching tags 240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to' 2d2118b814 The seventh batch for 2.26 325eb66830 Merge branch 'es/doc-mentoring' 87f17d790d Merge branch 'es/bright-colors' d0038f4b31 Merge branch 'bw/remote-rename-update-config' 132f600b06 clone: pass --single-branch during --recurse-submodules 47319576f1 submodule--helper: use C99 named initializer ffe005576a lib-log-graph: consolidate colored graph cmp logic 989eea958b lib-log-graph: consolidate test_cmp_graph logic bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching bb4995fc3f worktree: add utility to find worktree by pathname a80c4c2214 worktree: improve find_worktree() documentation 2fecc48cad packfile: drop nth_packed_object_sha1() 6ac9760a30 packed_object_info(): use object_id internally for delta base b99b6bcc57 packed_object_info(): use object_id for returning delta base 63f4a7fc01 pack-check: push oid lookup into loop e31c71083a pack-check: convert "internal error" die to a BUG() 500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps f66d4e0250 pack-objects: use object_id struct in pack-reuse code a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id 3f83fd5e44 pack-objects: read delta base oid into object_id struct 0763671b8e nth_packed_object_oid(): use customary integer return 02bbbe9df9 worktree: drop unused code from get_main_worktree() 27f182b3fc blame: provide type of fingerprints pointer b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere df126ca142 t3400: make test clean up after itself 3c29e21eb0 t: drop debug `cat` calls cac439b56d t9810: drop debug `cat` call 91de82adc9 t4117: check for files using `test_path_is_file` 4ef346482d receive.denyCurrentBranch: respect all worktrees f8692114db t5509: use a bare repository for test push target 45f274fbb1 get_main_worktree(): allow it to be called in the Git directory fd0bc17557 completion: add diff --color-moved[-ws] 2ce6d075fa use strpbrk(3) to search for characters from a given set 2b3c430bce quote: use isalnum() to check for alphanumeric characters a51d9e8f07 t1050: replace test -f with test_path_is_file 3e96c66805 partial-clone: avoid fetching when looking for objects d0badf8797 partial-clone: demonstrate bugs in partial fetch 539052f42f run-command.h: fix mis-indented struct member 6c11c6a124 sparse-checkout: allow one-character directories in cone mode aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch e8ef1e8d6e am: convert "resume" variable to a struct bc8620b440 parse-options: convert "command mode" to a flag 62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE() 46fd7b3900 credential: allow wildcard patterns when matching config 82eb249853 credential: use the last matching username in the config 588c70e10f t0300: add tests for some additional cases 732f934408 t1300: add test for urlmatch with multiple wildcards 3fa0e04667 mailmap: add an additional email address for brian m. carlson 8a98758a8d stash push: support the --pathspec-from-file option 8c3713cede stash: eliminate crude option parsing 3f3d8068f5 doc: stash: synchronize <pathspec> description b22909144c doc: stash: document more options 0093abc286 doc: stash: split options from description (2) 2b7460d167 doc: stash: split options from description (1) 5f393dc3aa rm: support the --pathspec-from-file option fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags 73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure 6c69f22233 bisect: libify `bisect_next_all` 9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents 45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents e8e3ce6718 bisect: libify `bisect_checkout` ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents 7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()` 680e8a01e5 bisect: add enum to represent bisect returning codes bfacfce7d9 bisect--helper: introduce new `decide_next()` function b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0 292731c4c2 bisect--helper: change `retval` to `res` 16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays 7ec8125fba check-ignore: fix documentation and implementation to match 2607d39da3 doc-diff: use single-colon rule in rendering Makefile 0aa6ce3094 doc/config/push: use longer "--" line for preformatted example 20a5fd881a rev-list --count: comment on the use of count_right++ 63a58457e0 Merge branch 'py/missing-bracket' 51ebf55b93 The sixth batch for 2.26 f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints' 123538444f Merge branch 'jk/doc-credential-helper' e154451a2f Merge branch 'js/mingw-open-in-gdb' fc25a19265 Merge branch 'js/test-unc-fetch' 6365058605 Merge branch 'js/test-avoid-pipe' 966b69f02f Merge branch 'js/test-write-junit-xml-fix' d880c3de23 Merge branch 'jk/mailinfo-cleanup' 5d55554b1d Merge branch 'mr/show-config-scope' 9f3f38769d Merge branch 'rs/strbuf-insertstr' cbecc168d4 Merge branch 'rs/parse-options-concat-dup' 5af345a438 Merge branch 'bc/hash-independent-tests-part-8' 0460c109c3 Merge branch 'rs/name-rev-memsave' 6b9919c0a2 git-gui: add missing close bracket 5897e5ac96 Merge branch 'cs/german-translation' cf85a32eb6 git-gui: update German translation 5096e51c54 git-gui: extend translation glossary template with more terms 8b85bb1b70 git-gui: update pot template and German translation to current source code e68e29171c Sync with 2.25.1 c522f061d5 Git 2.25.1 10cdb9f38a rebase: rename the two primary rebase backends 2ac0d6273f rebase: change the default backend from "am" to "merge" 8295ed690b rebase: make the backend configurable via config setting 76340c8107 rebase tests: repeat some tests using the merge backend instead of am 980b482d28 rebase tests: mark tests specific to the am-backend with --am c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases 6d04ce75c4 git-prompt: change the prompt for interactive-based rebases 52eb738d6b rebase: add an --am option 8af14f0859 rebase: move incompatibility checks between backend options a bit earlier be50c938df git-rebase.txt: add more details about behavioral differences of backends befb89ce7c rebase: allow more types of rebases to fast-forward 9a70f3d4ae t3432: make these tests work with either am or merge backends 93122c985a rebase: fix handling of restrict_revision 55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer 8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling 7db00f0b3b t3406: simplify an already simple test e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty d48e5e21da rebase (interactive-backend): make --keep-empty the default e0020b2f82 prefix_path: show gitdir when arg is outside repo cc4f2eb828 doc: move credential helper info into gitcredentials(7) bfdd66e72f Sync with maint 7ae7e234c7 The fifth batch for 2.26 53c3be2c29 Merge branch 'tb/commit-graph-object-dir' 7b029ebaef Merge branch 'jk/index-pack-dupfix' aa21cc97bd Merge branch 'jk/alloc-cleanups' 883326077a Merge branch 'jh/notes-fanout-fix' f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule' 78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs' df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' 433b8aac2e Merge branch 'ds/sparse-checkout-harden' 4a77434bc8 Merge branch 'ld/p4-cleanup-processes' 8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone' 09e48400a3 Merge branch 'jk/get-oid-error-message-i18n' 4dbeecba27 Merge branch 'ag/edit-todo-drop-check' f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2' d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout' 251187084d Merge branch 'js/rebase-i-with-colliding-hash' c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix' 56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store' 0da63da794 Merge branch 'jn/promote-proto2-to-default' a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup' daef1b300b Merge branch 'hw/advice-add-nothing' 6141e0cc00 Merge branch 'js/convert-typofix' into maint 4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint 5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint 7137d6089b Merge branch 'ms/doc-bundle-format' into maint 52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint 0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint 1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint 153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint 8857657cc9 Merge branch 'jt/t5616-robustify' into maint 1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint f468972671 Merge branch 'bc/misconception-doc' into maint 6e69042e26 Merge branch 'bc/author-committer-doc' into maint 650ed395be Merge branch 'ds/refmap-doc' into maint 80b806f1a8 Merge branch 'bc/actualmente' into maint eceff4ba12 Merge branch 'rt/submodule-i18n' into maint 8a17eb7972 Merge branch 'jk/test-fixes' into maint 54bbadaeca Merge branch 'jk/asan-build-fix' into maint 8dbeba198e Merge branch 'ds/sparse-cone' into maint e361f36f61 Merge branch 'nd/switch-and-restore' into maint 4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint 5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint 9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint 3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint 3ab3185f99 pack-objects: support filters with bitmaps 84243da129 pack-bitmap: implement BLOB_LIMIT filtering 4f3bd5606a pack-bitmap: implement BLOB_NONE filtering cc4aa28506 bitmap: add bitmap_unset() function 2aaeb9ac41 rev-list: use bitmap filters for traversal 6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure 4eb707ebd6 rev-list: allow commit-only bitmap traversals ea047a8eb4 t5310: factor out bitmap traversal comparison 608d9c9365 rev-list: allow bitmaps when counting objects 55cb10f9b5 rev-list: make --count work with --objects 792f811998 rev-list: factor out bitmap-optimized routines d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs 08809c09aa mingw: add a helper function to attach GDB to the current process bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths de26f02db1 t9001, t9116: avoid pipes a2dc43414c MyFirstContribution: rephrase contact info e03f928e2a rev-list: fallback to non-bitmap traversal when filtering acac50dd8c pack-bitmap: fix leak of haves/wants object lists 551cf8b655 pack-bitmap: factor out type iterator initialization d8437c57fa The fourth batch for 2.26 a3dcf84df0 Merge branch 'js/convert-typofix' 0de2d1409b Merge branch 'js/ci-squelch-doc-warning' 0410c2ba31 Merge branch 'jb/multi-pack-index-docfix' 0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example' e99c325bb4 Merge branch 'ms/doc-bundle-format' afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix' db72f8c940 Merge branch 'jb/parse-options-message-fix' 3d2471ba85 Merge branch 'ma/filter-branch-doc-caret' b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path' 44cba9c4b3 Merge branch 'jc/skip-prefix' 556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index' 17e4a1b141 Merge branch 'hw/doc-git-dir' 4cf7f48891 Merge branch 'jk/push-default-doc' b783391018 Merge branch 'jk/clang-sanitizer-fixes' a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache' 3f7553acf5 Merge branch 'jt/t5616-robustify' 341f8a6476 Merge branch 'jk/escaped-wildcard-dwim' b486d2ee81 Merge branch 'jn/pretend-object-doc' 076ee3e8a2 tests: fix --write-junit-xml with subshells 2b0f19fa7a convert: fix typo c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors 1751b09a92 color.c: support bright aixterm colors 4a28eb0ae4 color.c: refactor color_output arguments f696a2b1c8 mailinfo: factor out some repeated header handling ffbea1816d mailinfo: be more liberal with header whitespace f447d0293e mailinfo: simplify parsing of header values b6537d83ee mailinfo: treat header values as C strings ef07659926 sparse-checkout: work with Windows paths 2631dc879d sparse-checkout: create 'add' subcommand 4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand 6fb705abcb sparse-checkout: extract add_patterns_from_input() b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config f2a2327a4a config: provide access to the current line number 923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values ceff1a1308 remote: clean-up config callback 1a83068c26 remote: clean-up by returning early to avoid one indentation 88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types 145d59f482 config: add '--show-scope' to print the scope of a config value 9a83d088ee submodule-config: add subomdule config scope e37efa40e1 config: teach git_config_source to remember its scope 5c105a842e config: preserve scope in do_git_config_sequence 6766e41b8a config: clarify meaning of command line scoping 6dc905d974 config: split repo scope to local and worktree a5cb4204b6 config: make scope_name non-static and rename it 30183894ea ci: ignore rubygems warning in the "Documentation" job 7a9f8ca805 parse-options: simplify parse_options_dup() c84078573e parse-options: const parse_options_concat() parameters f904f9025f parse-options: factor out parse_options_count() a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat() 517b60564e mailinfo: don't insert header prefix for handle_content_type() a91cc7fad0 strbuf: add and use strbuf_insertstr() eb31044ff7 pack-format: correct multi-pack-index description 9299f84921 diff-options.txt: avoid "regex" overload in example 7378ec90e1 doc: describe Git bundle format f3037657e8 t6024: update for SHA-256 edf04243b2 t6006: make hash size independent 5db24dcffd t6000: abstract away SHA-1-specific constants d341e0805d t5703: make test work with SHA-256 88ed241a7e t5607: make hash size independent 48c10cc0e6 t5318: update for SHA-256 f7ae8e69b6 t5515: make test hash independent e70649bb66 t5321: make test hash independent a30f93b143 t5313: make test hash independent a79eec220b t5309: make test hash independent 796d1383a3 t5302: make hash size independent 417e45e5e3 t4060: make test work with SHA-256 dfa5f53e78 t4211: add test cases for SHA-256 f743e8f5b3 t4211: move SHA-1-specific test cases into a directory 72f936b120 t4013: make test hash independent 5df0f11f07 t3311: make test work with SHA-256 07877f393c t3310: make test work with SHA-256 6025e898d6 t3309: make test work with SHA-256 7b1a1822fe t3308: make test work with SHA-256 94db7e3e93 t3206: make hash size independent db12505c2c t/lib-pack: support SHA-256 303b3c1c46 submodule: add newline on invalid submodule error 887a0fd573 add: change advice config variables used by the add API de93cc14ab The third batch for 2.26 ea46d9097b Merge branch 'mt/sparse-checkout-doc-update' ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix' b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend' 7ab963e122 Merge branch 'en/fill-directory-fixes-more' f52ab33616 Merge branch 'bc/hash-independent-tests-part-7' 25794d6ce9 Merge branch 'km/submodule-add-errmsg' d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity' 76c57fedfa Merge branch 'js/add-p-leftover-bits' 9a5315edfd Merge branch 'js/patch-mode-in-others-in-c' 381e8e9de1 Merge branch 'dl/test-must-fail-fixes' 395518cf7a parse-options: lose an unnecessary space in an error message 079f970971 name-rev: sort tip names before applying 2d53975488 name-rev: release unused name strings 977dc1912b name-rev: generate name strings only if they are better 1c56fc2084 name-rev: pre-size buffer in get_parent_name() ddc42ec786 name-rev: factor out get_parent_name() f13ca7cef5 name-rev: put struct rev_name into commit slab d689d6d82f name-rev: don't _peek() in create_or_update_name() 15a4205d96 name-rev: don't leak path copy in name_ref() 36d2419c9a name-rev: respect const qualifier 71620ca86c name-rev: remove unused typedef 3e2feb0d64 name-rev: rewrite create_or_update_name() a21781011f index-pack: downgrade twice-resolved REF_DELTA to die() dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout e1c5253951 t3305: check notes fanout more carefully and robustly e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st' ad2dd5bb63 commit-graph.c: remove path normalization, comparison 13c2499249 commit-graph.h: store object directory in 'struct commit_graph' 0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context' f38c92452d t7400: testcase for submodule status on unregistered inner git repos 5290d45134 tree-walk.c: break circular dependency with unpack-trees f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode e53ffe2704 sparse-checkout: escape all glob characters on write e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand bd64de42de sparse-checkout: unquote C-style strings over --stdin d585f0e799 sparse-checkout: write escaped patterns in cone mode 4f52c2ce6c sparse-checkout: properly match escaped characters 9abc60f801 sparse-checkout: warn on globs in cone patterns 145136a95a C: use skip_prefix() to avoid hardcoded string length 04e5b3f0b4 submodule foreach: replace $path with $sm_path in example 1793280e91 t5318: don't pass non-object directory to '--object-dir' da8063522f diff: move diff.wsErrorHighlight to "basic" config b98d188581 sha1-file: allow check_object_signature() to handle any repo 2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file() 7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare() c8123e72f6 streaming: allow open_istream() to handle any repo 5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile() a651946730 cache-tree: use given repo's hash_algo at verify_one() eb999b3295 diff: make diff_populate_filespec() honor its repo argument 5b0ca878e0 Sync with maint 344ee18728 The second batch 53a83299c7 Merge branch 'bc/misconception-doc' c9ccf9d09b Merge branch 'bc/author-committer-doc' 0d0fa20c40 Merge branch 'ss/t6025-modernize' 7050624abc Merge branch 'lh/bool-to-type-bool' 4b69f29271 Merge branch 'ds/refmap-doc' aff812ce3c Merge branch 'bc/actualmente' 38fb56e92a Merge branch 'rt/submodule-i18n' f0940743fa Merge branch 'js/builtin-add-i-cmds' 0afeb3fdf4 Merge branch 'jk/test-fixes' 808dab2b58 Merge branch 'jk/asan-build-fix' fec1ff97c2 Merge branch 'sg/completion-worktree' c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function' 11ad30b887 Merge branch 'hi/gpg-mintrustlevel' 96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases' d52adee779 Merge branch 'ds/graph-horizontal-edges' 6909474491 Merge branch 'am/update-pathspec-f-f-tests' 043426c8fd Merge branch 'ds/sparse-cone' 34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig' 8dd40c0472 traverse_trees(): use stack array for name entries 667b76ec58 walker_fetch(): avoid raw array length computation 9734b74a8f normalize_path_copy(): document "dst" size expectations 43f33e492a git-p4: avoid leak of file handle when cloning 19fa5ac333 git-p4: check for access to remote host earlier 6026aff5bb git-p4: cleanup better on error exit ca5b5cce62 git-p4: create helper function importRevisions() 4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable 5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce 837b3a6376 git-p4: make closeStreams() idempotent b0418303b1 sha1-name: mark get_oid() error messages for translation 2df1aa239c fetch: forgo full connectivity check if --filter 50033772d5 connected: verify promisor-ness of partial clone d82ad54945 git: update documentation for --git-dir 0ad7144999 .mailmap: map Yi-Jyun Pan's email c56c48dd07 grep: ignore --recurse-submodules if --no-index is given 8b2a1928f0 doc: drop "explicitly given" from push.default description cf82bff73f obstack: avoid computing offsets from NULL pointer 3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer d20bc01a51 avoid computing zero offsets from NULL pointer 7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero bc3f657f71 t1506: drop space after redirection operator e5d7b2f65c t1400: avoid "test" string comparisons 5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c c7a6207591 Sync with maint 7210ca4ee5 .mailmap: fix GGG authoship screwup 37a63faae5 t4124: only mark git command with test_must_fail a8c663cf65 t3507: use test_path_is_missing() 2def7f017c t3507: fix indentation e8a1c686ae t3504: do check for conflict marker after failed cherry-pick 1c9fd32fd2 t3419: stop losing return code of git command c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}() a781cd6fef t3415: stop losing return codes of git commands 86ce6e0dd1 t3310: extract common notes_merge_files_gone() 245b9ba0ba t3030: use test_path_is_missing() 4a6f11fd7b t2018: replace "sha" with "oid" 62e80fcb48 t2018: don't lose return code of git commands 30c0367668 t2018: teach do_checkout() to accept `!` arg 40caa5366a t2018: be more discerning when checking for expected exit codes b54128bb0b t5616: make robust to delta base change 4c616c2ba1 merge-recursive: use subtraction to flip stage ee798742bd merge-recursive: silence -Wxor-used-as-pow warning 39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin 3b2885ec9b submodule: fix status of initialized but not cloned submodules ace912bfb8 t7400: add a testcase for submodule status on empty dirs 4bb4fd4290 MyFirstContribution: add avenues for getting help 9e6d3e6417 sparse-checkout: detect short patterns 41de0c6fbc sparse-checkout: cone mode does not recognize "**" 7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone 47dbf10d8a clone: fix --sparse option with URLs 3c754067a1 sparse-checkout: create leading directories d622c34396 t1091: improve here-docs 522e641748 t1091: use check_files to reduce boilerplate 417be08d02 t1300: create custom config file without special characters 3de7ee369b t1300: fix over-indented HERE-DOCs 329e6ec397 config: fix typo in variable name 767a9c417e rebase -i: stop checking out the tip of the branch to rebase dfaed02862 fsmonitor: update documentation for hook version and watchman hooks e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2 d031049da3 completion: add support for sparse-checkout a402723e48 doc: sparse-checkout: mention --cone option 26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck b6992261de rebase -i: re-fix short SHA-1 collision d859dcad94 parse_insn_line(): improve error message when parsing failed d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects 92fb0db94c pack-objects: add checks for duplicate objects bb514de356 pack-objects: improve partial packfile reuse ff483026a9 builtin/pack-objects: introduce obj_is_packed() e704fc7978 pack-objects: introduce pack.allowPackReuse 2f4af77699 csum-file: introduce hashfile_total() 8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting() 59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile 40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains() 14fbd26044 ewah/bitmap: introduce bitmap_word_alloc() bc7a3d4dc0 The first batch post 2.25 cycle 09e393d913 Merge branch 'nd/switch-and-restore' 45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' 0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout' 36da2a8635 Merge branch 'es/unpack-trees-oob-fix' 42096c778d Merge branch 'bc/run-command-nullness-after-free-fix' 1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted' a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees' e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached' 9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting' 237a83a943 Merge branch 'dl/credential-netrc' a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir() 129510a067 t2405: clarify test descriptions and simplify test 4eaadc8493 t2405: use git -C and test_commit -C instead of subshells 773c60a45e t7410: rename to t2405-worktree-submodule.sh 7a2dc95cbc docs: mention when increasing http.postBuffer is valuable 1b13e9032f doc: dissuade users from trying to ignore tracked files 69e104d70e doc: provide guidance on user.name format 813f6025a5 docs: expand on possible and recommended user config options bc94e5862a doc: move author and committer information to git-commit(1) 7979dfe1d4 l10n: Update Catalan translation 81e3db42f3 templates: fix deprecated type option `--bool` c513a958b6 t6025: use helpers to replace test -f <path> 70789843bd t6025: modernize style 6a7aca6f01 doc: rm: synchronize <pathspec> description 856249c62a docs: use "currently" for the present time b40a50264a fetch: document and test --refmap="" a9ae8fde2e t3404: directly test the behavior of interest 22a69fda19 git-rebase.txt: update description of --allow-empty-message f1928f04b2 grep: use no. of cores as the default no. of threads 70a9fef240 grep: move driver pre-load out of critical section 1184a95ea2 grep: re-enable threads in non-worktree case 6c307626f1 grep: protect packed_git [re-]initialization c441ea4edc grep: allow submodule functions to run in parallel d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules() 1d1729caeb grep: replace grep_read_mutex by internal obj read lock 31877c9aec object-store: allow threaded access to object reading b1fc9da1c8 replace-object: make replace operations thread-safe d5b0bac528 grep: fix racy calls in grep_objects() faf123c730 grep: fix race conditions at grep_submodule() c3a5bb31c1 grep: fix race conditions on userdiff calls 0222540827 fetch: emphasize failure during submodule fetch 232378479e Sync with maint e4837b4406 t7800: don't rely on reuse_worktree_file() fbce03d329 t4018: drop "debugging" cat from hunk-header tests f65d07fffa Makefile: use compat regex with SANITIZE=address 849e43cc18 built-in add -i: accept open-ended ranges again d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files a4ffbbbb99 submodule.c: mark more strings for translation 0cbb60574e dir: point treat_leading_path() warning to the right place ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent 22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2 f365bf40a0 clean: demonstrate a bug with pathspecs b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x 277eb5af7c t5604: make hash independent 44b6c05b43 t5601: switch into repository to hash object 7a868c51c2 t5562: use $ZERO_OID 1b8f39fb0d t5540: make hash size independent a8c17e3bd6 t5537: make hash size independent 832072219c t5530: compute results based on object length 74ad99b1d8 t5512: abstract away SHA-1-specific constants ba1be1ab45 t5510: make hash size independent cba472d3ad t5504: make hash algorithm independent 82d5aeb1e6 t5324: make hash size independent 3c5e65cac1 t5319: make test work with SHA-256 235d3cddb8 t5319: change invalid offset for SHA-256 compatibility 1d86c8f0ce t5318: update for SHA-256 525a7f1769 t4300: abstract away SHA-1-specific constants 7a1bcb251b t4204: make hash size independent cb78f4f0fe t4202: abstract away SHA-1-specific constants 717c939d8f t4200: make hash size independent 08a9dd891c t4134: compute appropriate length constant 215b60bf07 t4066: compute index line in diffs 194264c185 t4054: make hash-size independent 7d5ecd775d completion: list paths and refs for 'git worktree add' 3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands 3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options 367efd54b3 completion: return the index of found word from __git_find_on_cmdline() d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function 2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper 54887b4689 gpg-interface: add minTrustLevel as a configuration option 684ceae32d fetch: default to protocol version 2 33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION 8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate b9ab170752 config doc: protocol.version is not experimental 07ef3c6604 fetch test: use more robust test for filtered objects d6509da620 fetch test: mark test of "skipping" haves as v0-only a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function bf66db37f1 add: use advise function to display hints c958d3bd0a graph: fix collapse of multiple edges 8588932e20 graph: add test to demonstrate horizontal line bug d0d0a357a1 t: directly test parse_pathspec_file() 568cabb2fe t: fix quotes tests for --pathspec-from-file f94f7bd00d t: add tests for error conditions with --pathspec-from-file b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job 12acdf573a built-in add -p: handle Escape sequences more efficiently e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode 04f816b125 built-in add -p: respect the `interactive.singlekey` config setting a5e46e6b01 terminal: add a new function to read a single keystroke 9ea416cb51 terminal: accommodate Git for Windows' default terminal 94ac3c31f7 terminal: make the code of disable_echo() reusable 08b1ea4c39 built-in add -p: handle diff.algorithm 180f48df69 built-in add -p: support interactive.diffFilter 1e4ffc765d t3701: adjust difffilter test c81638541c submodule add: show 'add --dry-run' stderr when aborting 8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token 56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token d0654dc308 Git 2.25 b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po 4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'" ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1 e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master 1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' d78a1968c5 Merge branch 'ma/config-advice-markup-fix' a20ae3ee29 l10n: Update Catalan translation 49e268e23e mingw: safeguard better against backslashes in file names 4c6c7971e0 unpack-trees: correctly compute result count 63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1 75449c1b39 l10n: de.po: Reword generation numbers 6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t) 3901d2c6bd config/advice.txt: fix description list separator 7a6a90c6ec Git 2.25-rc2 1f5f3ffe5c Merge branch 'ds/graph-assert-fix' a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix' 202f68b252 Merge branch 'pm/am-in-body-header-doc-update' 7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix' c5dc20638b Merge branch 'do/gitweb-typofix-in-comments' fe47c9cb5f Merge https://github.com/prati0100/git-gui a1087c9367 graph: fix lack of color in horizontal lines 0d251c3291 graph: drop assert() for merge with two collapsing parents 4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper 573117dfa5 unpack-trees: watch for out-of-range index position e701bab3e9 restore: invalidate cache-tree when removing entries with --staged 1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command fa74180d08 checkout: don't revert file on ambiguous tracking branches 2957709bd4 parse_branchname_arg(): extract part as new function 5020f6806a t2018: improve style of if-statement 7ffb54618b t2018: add space between function name and () 63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH 065027ee1a string-list: note in docs that callers can specify sorting function 26f924d50e unpack-trees: exit check_updates() early if updates are not wanted 042ed3e048 The final batch before -rc2 0f1930cd1b Merge branch 'ds/sparse-cone' 037f067587 Merge branch 'ds/commit-graph-set-size-mult' f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify' c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode' a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' c4117fcb97 Merge branch 'pb/clarify-line-log-doc' 556f0258df Merge branch 'ew/packfile-syscall-optim' 5814d44d9b doc: submodule: fix typo for command absorbgitdirs 7047f75f22 editorconfig: indent text files with tabs 60440d72db sha1-file: document how to use pretend_object_file 7fdc5f296f l10n: es: 2.25.0 round #1 f8740c586b am: document that Date: can appear as an in-body header 4e2c4c0d4f gitweb: fix a couple spelling errors in comments 421c0ffb02 multi-pack-index: correct configuration in documentation 757ff352bd Documentation/git-sparse-checkout.txt: fix a typo 0d2116c644 Merge branch 'zs/open-current-file' 9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u) 3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master 4c5081614c l10n: fr.po v2.25.0 rnd 1 5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0 63020f175f commit-graph: prefer default size_mult when given zero 224c7d70fa mingw: only test index entries for backslashes, not tree entries 9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED 8679ef24ed Git 2.25-rc1 a82027e9e6 Merge branch 'js/use-test-tool-on-path' 13432fc6dd Merge branch 'js/mingw-reserved-filenames' e0e1ac5db0 Merge branch 'en/rebase-signoff-fix' b76a244c9d Merge branch 'em/freebsd-cirrus-ci' bc855232bc Merge branch 'bk/p4-misc-usability' 763a59e71c merge-recursive: remove unnecessary oid_eq function 44143583b7 sparse-checkout: use extern for global variables d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master 13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1 786f4d2405 git-gui: allow opening currently selected file in default app 4fd683b6a3 sparse-checkout: document interactions with submodules de11951b03 sparse-checkout: list directories in cone mode 0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0 578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) 173fff68da Merge tag 'v2.25.0-rc0' into git-po-master f1842ff531 t2018: remove trailing space from test description 20a67e8ce9 t3008: find test-tool through path lookup 9e341f62ca l10n: Update Catalan translation 4e61b2214d packfile: replace lseek+read with pread ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision 2be45868a8 doc: log, gitk: document accepted line-log diff formats 280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD 0a76bd7381 mailmap: mask accentless variant for Công Danh 99c33bed56 Git 2.25-rc0 d2189a721c Merge branch 'en/fill-directory-fixes' 8be0a428d6 Merge branch 'rs/test-cleanup' 65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string' c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 45b96a6fa1 Merge branch 'js/add-p-in-c' ccc292e862 Merge branch 'jc/drop-gen-hdrs' dfee504bee Merge branch 'ja/doc-markup-cleanup' 87cbb1ca66 Merge branch 'rs/ref-read-cleanup' 20aa6d88b7 Merge branch 'rb/p4-lfs' fcd5b55f56 Merge branch 'pb/submodule-doc-xref' 4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free' ba6b66281e Merge branch 'ln/userdiff-elixir' bd72a08d6c Merge branch 'ds/sparse-cone' f3c520e17f Merge branch 'sg/name-rev-wo-recursion' 6514ad40a1 Merge branch 'ra/t5150-depends-on-perl' 17066bea38 Merge branch 'dl/format-patch-notes-config-fixup' 135365dd99 Merge branch 'am/pathspec-f-f-checkout' ff0cb70d45 Merge branch 'am/pathspec-from-file' 4dc42c6c18 mingw: refuse paths containing reserved names 98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16 c480eeb574 commit --interactive: make it work with the built-in `add -i` cee6cb7300 built-in add -p: implement the "worktree" patch modes 52628f94fc built-in add -p: implement the "checkout" patch modes 6610e4628a built-in stash: use the built-in `git add -p` if so configured 90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting 36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes d2a233cb8b built-in add -p: prepare for patch modes other than "stage" 761e3d26bb sparse-checkout: improve OS ls compatibility 6579d93a97 contrib/credential/netrc: work outside a repo 1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI b441717256 t1507: inline full_name() 9291e6329e t1507: run commands within test_expect_success 5236fce6b4 t1507: stop losing return codes of git commands 10812c2337 t1501: remove use of `test_might_fail cp` 62d58cda69 t1409: use test_path_is_missing() b87b02cfe6 t1409: let sed open its own input file 9b92070e52 t1307: reorder `nongit test_must_fail` 3595d10c26 t1306: convert `test_might_fail rm` to `rm -f` f511bc02ed t0020: use ! check_packed_refs_marked f6041abdcd t0020: don't use `test_must_fail has_cr` f46c243e66 t0003: don't use `test_must_fail attr_check` 99c049bc4c t0003: use test_must_be_empty() 3738439c77 t0003: use named parameters in attr_check() 7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err() b8afb908c2 t/lib-git-p4: use test_path_is_missing() 4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases 6836d2fe06 dir.c: use st_add3() for allocation size c847dfafee dir: consolidate similar code in treat_directory() 777b420347 dir: synchronize treat_leading_path() and read_directory_recursive() b9670c1f5e dir: fix checks on common prefix directory 5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit 23cbe427c4 Merge branch 'py/console-close-esc' 124a895811 t4015: improve coverage of function context test 509efef789 commit: forbid --pathspec-from-file --all 12029dc57d t3434: mark successful test as such e0f9095aaa notes.h: fix typos in comment 675ef6bab8 t6030: don't create unused file 01ed17dc8c t5580: don't create unused file f670adb49b t3501: don't create unused file 1e1ccbfdd3 git-gui: allow closing console window with Escape 7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays. b02fd2acca The sixth batch 59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex' e3b72391d1 Merge branch 'rs/commit-export-env-simplify' 43bf44e23a Merge branch 'rs/archive-zip-code-cleanup' 4438a1a59f Merge branch 'js/t3404-indent-fix' 3a44db2ed2 Merge branch 'dr/branch-usage-casefix' 8bc481f4f6 Merge branch 'sg/t9300-robustify' 011fc2e88e Merge branch 'js/add-i-a-bit-more-tests' d1c0fe8d9b Merge branch 'dl/range-diff-with-notes' 26c816a67d Merge branch 'hw/doc-in-header' f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 71a7de7a99 Merge branch 'dl/rebase-with-autobase' c9f5fc9114 Merge branch 'dl/test-cleanup' 6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap' 3beff388b2 Merge branch 'js/builtin-add-i-cmds' 4755a34c47 Merge branch 'dd/time-reentrancy' 37c2619d91 Merge branch 'ag/sequencer-todo-updates' 608e380502 git-p4: show detailed help when parsing options fail e2aed5fd5b git-p4: yes/no prompts should sanitize user text 571fb96573 fix-typo: consecutive-word duplications f371984613 Makefile: drop GEN_HDRS 2e4083198d built-in add -p: show helpful hint when nothing can be staged 54d9d9b2ee built-in add -p: only show the applicable parts of the help text ade246efed built-in add -p: implement the 'q' ("quit") command d6cf873340 built-in add -p: implement the '/' ("search regex") command 9254bdfb4f built-in add -p: implement the 'g' ("goto") command bcdd297b78 built-in add -p: implement hunk editing b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf" 11f2c0dae8 built-in add -p: coalesce hunks after splitting them 510aeca199 built-in add -p: implement the hunk splitting feature 0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions 5906d5de77 built-in app -p: allow selecting a mode change as a "hunk" 47dc4fd5eb built-in add -p: handle deleted empty files 80399aec5a built-in add -p: support multi-file diffs 7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed 12c24cf850 built-in add -p: color the prompt and the help text 25ea47af49 built-in add -p: adjust hunk headers as needed e3bd11b4eb built-in add -p: show colored hunks by default 1942ee44e8 built-in add -i: wire up the new C code for the `patch` command f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C d1b1384d61 userdiff: remove empty subexpression from elixir regex df5be01669 doc: indent multi-line items in list fd5041e127 doc: remove non pure ASCII characters 190a65f9db sparse-checkout: respect core.ignoreCase in cone mode 1d7297513d notes: break set_display_notes() into smaller functions 66f79ee23d config/format.txt: clarify behavior of multiple format.notes cc2bd5c45d gitmodules: link to gitsubmodules guide 99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed 8c02fe6060 t7004: don't create unused file cb05d6a5ed t4256: don't create unused file c5c4eddd56 dir: break part of read_directory_recursive() out for reuse 072a231016 dir: exit before wildcard fall-through if there is no wildcard 2f5d3847d4 dir: remove stray quote character in comment a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories" 452efd11fb t3011: demonstrate directory traversal failures ea94b16fb8 git-p4: honor lfs.storage configuration variable 51a0a4ed95 bisect--helper: avoid use-after-free d32e065a91 Merge branch 'kk/branch-name-encoding' ad05a3d8e5 The fifth batch 7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix' b089e5e6cb Merge branch 'em/test-skip-regex-illseq' 930078ba39 Merge branch 'hi/gpg-use-check-signature' 08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode' 7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk' 55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm' 41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress' 5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise' dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix' d37cfe3b5c Merge branch 'dl/pretty-reference' 99c4ff1bda Merge branch 'dl/submodule-set-url' 55d607d85b Merge branch 'js/mingw-inherit-only-std-handles' c58ae96fc4 Merge branch 'am/pathspec-from-file' 7c88714262 Merge branch 'po/bundle-doc-clonable' 5d9324e0f4 Merge branch 'ra/rebase-i-more-options' 7034cd094b Sync with Git 2.24.1 09ac67a183 format-patch: move git_config() before repo_init_revisions() 8164c961e1 format-patch: use --notes behavior for format.notes 452538c358 notes: extract logic into set_display_notes() e6e230eeae notes: create init_display_notes() helper 1e6ed5441a notes: rename to load_display_notes() 2866fd284c name-rev: cleanup name_ref() 49f7a2fde9 name-rev: eliminate recursion in name_rev() fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name' e05e8cf074 archive-zip: use enum for compression method 39acfa3d22 git gui: fix branch name encoding error 11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description 8cf8f9b4aa t3404: fix indentation 4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs 147ee35558 commit: use strbuf_add() to add a length-limited string 559c6fc317 The fourth batch 56e6c16394 Merge branch 'dl/lore-is-the-archive' 3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive' 7cb0d37f6d Merge branch 'tg/perf-remove-stale-result' 403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick' f0cf2fee5d Merge branch 'hi/grep-do-not-return-void' 391fb22ac7 Merge branch 'rs/use-skip-prefix-more' 92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd' 4ba74ca901 Merge branch 'rs/test-cleanup' f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick' ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9' 8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters 3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances dd432a6ecf name-rev: restructure parsing commits and applying date cutoff dd090a8a37 name-rev: pull out deref handling from the recursion 766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev() bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation e0c4da6f2a name-rev: avoid unnecessary cast in name_ref() c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name() c593a26348 t6120-describe: modernize the 'check_describe' helper abcf857300 range-diff: clear `other_arg` at end of function f8675343d7 range-diff: mark pointers as const 828765dfe0 t3206: fix incorrect test name 0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early 21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile b4bbbbd5a2 apply --allow-overlap: fix a corner case 89c8559367 git add -p: use non-zero exit code when the diff generation failed e91162be9c t3701: verify that the diff.algorithm config setting is handled 0c3222c4f3 t3701: verify the shown messages when nothing can be added 24be352d52 t3701: add a test for the different `add -p` prompts 8539b46534 t3701: avoid depending on the TTY prerequisite 0f0fba2cc8 t3701: add a test for advanced split-hunk editing 53a06cf39b Git 2.24.1 67af91c47a Sync with 2.23.1 a7312d1a28 Git 2.23.1 7fd9fd94fb Sync with 2.22.2 d9589d4051 Git 2.22.2 5421ddd8d0 Sync with 2.21.1 367f12b7e9 Git 2.21.1 20c71bcf67 Merge branch 'fix-msys2-quoting-bugs' 7d8b676992 mingw: sh arguments need quoting in more circumstances d9061ed9da t7415: drop v2.20.x-specific work-around 04522edbd4 mingw: fix quoting of empty arguments for `sh` 49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly fc346cb292 Sync with 2.20.2 4cd1cf31ef Git 2.20.2 c154745074 submodule: defend against submodule.update = !command in .gitmodules 4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x d851d94151 Sync with 2.19.3 caccc527ca Git 2.19.3 7c9fbda6e2 Sync with 2.18.2 9877106b01 Git 2.18.2 14af7ed5a9 Sync with 2.17.3 a5ab8d0317 Git 2.17.3 bb92255ebe fsck: reject submodule.update = !command in .gitmodules bdfef0492c Sync with 2.16.6 eb288bc455 Git 2.16.6 68440496c7 test-drop-caches: use `has_dos_drive_prefix()` 9ac92fed5b Sync with 2.15.4 7cdafcaacf Git 2.15.4 e904deb89d submodule: reject submodule.update = !command in .gitmodules d3ac8c3f27 Sync with 2.14.6 66d2a6159f Git 2.14.6 083378cc35 The third batch 88bd37a2d0 Merge branch 'js/pkt-line-h-typofix' 473b431410 Merge branch 'us/unpack-trees-fsmonitor' e0f9ec9027 Merge branch 'sg/test-bool-env' fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset' e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere' 88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory' 8feb47e882 Merge branch 'dl/t5520-cleanup' 6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree' 57d46bc602 Merge branch 'mg/doc-submodule-status-cached' 75bd003c7b Merge branch 'js/git-svn-use-rebase-merges' f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix' c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits' 36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree' cf91c31688 Merge branch 'sg/unpack-progress-throughput' ef6104581d Merge branch 'pb/submodule-update-fetches' 7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix' f3c7bfdde2 Merge branch 'dl/range-diff-with-notes' 9502b616f1 Merge branch 'jh/userdiff-python-async' 76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2' 995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label' f7998d9793 Merge branch 'js/builtin-add-i' 917d0d6234 Merge branch 'js/rebase-r-safer-label' 56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers' 2763530048 Merge branch 'jg/revert-untracked' fa38ab68b0 git-gui: revert untracked files by deleting them d9c6469f38 git-gui: update status bar to track operations 29a9366052 git-gui: consolidate naming conventions 0bb313a552 xdiff: unignore changes in function context 2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names' 65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods' 5532ebdeb7 Merge branch 'fix-mingw-quoting-bug' 76a681ce9c Merge branch 'dubiously-nested-submodules' dd53ea7220 Merge branch 'turn-on-protectntfs-by-default' f82a97eb91 mingw: handle `subst`-ed "DOS drives" 7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams' d2c84dad1c mingw: refuse to access paths with trailing spaces or periods 379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh 817ddd64c2 mingw: refuse to access paths with illegal characters cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors 7530a6287e quote-stress-test: allow skipping some trials 35edce2056 t6130/t9350: prepare for stringent Win32 path validation 55953c77c0 quote-stress-test: accept arguments to test via the command-line ad15592529 tests: add a helper to stress test argument quoting a8dee3ca61 Disallow dubiously-nested submodule git directories 9102f958ee protect_ntfs: turn on NTFS protection by default 91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams 6d8684161e mingw: fix quoting of arguments 3a85dc7d53 is_ntfs_dotgit(): speed it up 7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses 288a74bcd2 is_ntfs_dotgit(): only verify the leading segment a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark cae0bc09ab rebase: fix format.useAutoBase breakage 945dc55dda format-patch: teach --no-base 700e006c5d t4014: use test_config() a749d01e1d format-patch: fix indentation 0c47e06176 t3400: demonstrate failure with format.useAutoBase d9b31db2c4 t7700: stop losing return codes of git commands 3699d69df0 t7700: make references to SHA-1 generic dcf9a748ca t7700: replace egrep with grep cfe5eda02a t7700: consolidate code into test_has_duplicate_object() ae475afc0f t7700: consolidate code into test_no_missing_in_packs() 14b7664df8 doc: replace LKML link with lore.kernel.org d23f9c8e04 RelNotes: replace Gmane with real Message-IDs dcee037228 doc: replace MARC links with lore.kernel.org a9aecc7abb checkout, restore: support the --pathspec-from-file option cfd9376c1d doc: restore: synchronize <pathspec> description 8ea1189eac doc: checkout: synchronize <pathspec> description 6fdc9ad259 doc: checkout: fix broken text reference 1d022bb43f doc: checkout: remove duplicate synopsis bebb5d6d6b add: support the --pathspec-from-file option 21bb3083c3 cmd_add: prepare for next patch 4778452597 Merge branch 'prevent-name-squatting-on-windows' a7b1ad3b05 Merge branch 'jk/fast-import-unsafe' 525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()` e1d911dd4c mingw: disallow backslash characters in tree objects' file names 0060fd1511 clone --recurse-submodules: prevent name squatting on Windows a52ed76142 fast-import: disallow "feature import-marks" by default 68061e3470 fast-import: disallow "feature export-marks" by default 019683025f fast-import: delay creating leading directories for export-marks e075dba372 fast-import: stop creating leading directories for import-marks 11e934d56e fast-import: tighten parsing of boolean command line options 816f806786 t9300: create marks files for double-import-marks test f94804c1f2 t9300: drop some useless uses of cat 4f3e57ef13 submodule--helper: advise on fatal alternate error 10c64a0b3c Doc: explain submodule.alternateErrorStrategy ec48540fe8 packfile.c: speed up loading lots of packfiles 3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value a4fb016ba1 pkt-line: fix a typo 0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data 228f53135a The second batch 6c630f237e Merge branch 'jk/gitweb-anti-xss' 3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell' 4775e02a5c Merge branch 'ma/t7004' a6c6f8d02a Merge branch 'js/complete-svn-recursive' 3ae8defaf9 Merge branch 'jk/send-pack-remote-failure' aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix' 4ab9616c76 Merge branch 'sg/skip-skipped-prereq' 723a8adba5 Merge branch 'ds/test-read-graph' 9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation' 406ca29e0d Merge branch 'rs/parse-options-dup-null-fix' fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging' 8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion' ef8f621045 Merge branch 'dl/complete-rebase-onto' 3c3e5d0ea2 Merge branch 'tg/stash-refresh-index' 43c5fe1c1d Merge branch 'nn/doc-rebase-merges' 6511cb33c9 Merge branch 'dd/sequencer-utf8' f165457618 Merge branch 'jk/remove-sha1-to-hex' a774064fb0 Merge branch 'dj/typofix-merge-strat' ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates' d2489ce92c Merge branch 'rs/skip-iprefix' 376e7309e1 Merge branch 'ln/userdiff-elixir' 9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log' d3096d2ba6 Merge branch 'en/doc-typofix' 26f20fa3fc Merge branch 'ns/test-desc-typofix' ffd130a363 Merge branch 'en/t6024-style' 5149902ff9 Merge branch 'en/misc-doc-fixes' bcb06e204c Merge branch 'js/fetch-multi-lockfix' d08daec001 Merge branch 'rs/trace2-dots' fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix' bad5ed39cd Merge branch 'cb/curl-use-xmalloc' 7ab2088255 Merge branch 'rt/fetch-message-fix' f089ddd56a Merge branch 'es/myfirstcontrib-updates' 3c90710c0c Merge branch 'hw/config-doc-in-header' d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code' 5444d52866 Merge branch 'js/vreportf-wo-buffering' 05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add' ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides' 532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default' dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists' fac9ab1419 Merge branch 'ma/bisect-doc-sample-update' a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix' 0be5caf97c Merge branch 'jc/log-graph-simplify' 0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck' 2e697ced9d built-in add -i: offer the `quit` command d7633578b5 built-in add -i: re-implement the `diff` command 8746e07277 built-in add -i: implement the `patch` command ab1e1cccaf built-in add -i: re-implement `add-untracked` in C c54ef5e424 built-in add -i: re-implement `revert` in C a8c45be939 built-in add -i: implement the `update` command f37c226454 built-in add -i: prepare for multi-selection commands c08171d156 built-in add -i: allow filtering the modified files list 0c3944a628 add-interactive: make sure to release `rev.prune_data` 4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance 867fc7f310 grep: don't return an expression from pcre2_free() c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables 72b006f4bf gpg-interface: prefer check_signature() for GPG verification 7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r ccd469450a date.c: switch to reentrant {gm,local}time_r 271c351b2f t7811: don't create unused file 65efb42862 t9300: don't create unused file f6b9413baf sequencer: fix a memory leak in sequencer_continue() 3eae30e464 doc: replace public-inbox links with lore.kernel.org 46c67492aa doc: recommend lore.kernel.org over public-inbox.org 5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects 17a4ae92ea t7700: s/test -f/test_path_is_file/ d2eee32a89 t7700: move keywords onto their own line 7a1c8c2346 t7700: remove spaces after redirect operators 09279086e8 t7700: drop redirections to /dev/null 756ee7fc9f t7501: stop losing return codes of git commands 38c1aa01de t7501: remove spaces after redirect operators 763b47bafa t5703: stop losing return codes of git commands eacaa1c180 t5703: simplify one-time-sed generation logic a29b2429e5 t5317: use ! grep to check for no matching lines 6c37f3ec1b t5317: stop losing return codes of git commands b66e0a1773 t4138: stop losing return codes of git commands afd43c9905 t4015: use test_write_lines() 946d2353a3 t4015: stop losing return codes of git commands 50cd31c652 t3600: comment on inducing SIGPIPE in `git rm` 3b737381d8 t3600: stop losing return codes of git commands 0d913dfa7e t3600: use test_line_count() where possible 29a40b5a67 t3301: stop losing return codes of git commands 9b5a9fa60a t0090: stop losing return codes of git commands 17aa9d9c1a t0014: remove git command upstream of pipe 77a946be98 apply-one-time-sed.sh: modernize style 176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job ed254710ee test: use test_must_be_empty F instead of test_cmp empty F c74b3cbb83 t7812: add missing redirects 213dabf49d test: use test_must_be_empty F instead of test -z $(cat F) c93a5aaec8 t1400: use test_must_be_empty 6e4826ea75 t1410: use test_line_count a5d04a3ef9 t1512: use test_line_count 54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd() 2059e79c0d name-rev: use skip_prefix() instead of starts_with() 1768aaf01d push: use skip_prefix() instead of starts_with() ec6ee0c07a shell: use skip_prefix() instead of starts_with() 7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with() a6293f5d28 fetch: use skip_prefix() instead of starts_with() 13ca8fb79e t5150: skip request-pull test if Perl is disabled ecc0869080 commit-graph: use start_delayed_progress() 44a4693bfc progress: create GIT_PROGRESS_DELAY 528d9e6d01 t/perf: don't depend on Git.pm b8dcc45387 perf-lib: use a single filename for all measurement types fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk' d82dfa7f5b rebase -i: finishing touches to --reset-author-date 1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory 393adf7a6f sequencer: directly call pick_commits() from complete_action() a2dd67f105 rebase: fill `squash_onto' in get_replay_opts() 3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function 34065541e3 sequencer: update `done_nr' when skipping commands in a todo list 8638114e06 sequencer: update `total_nr' when adding an item to a todo list 0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions 9917eca794 l10n: zh_TW: add translation for v2.24.0 0a8e3036a3 reset: parse rev as tree-ish in patch mode f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits 8d483c8408 doc: document 'git submodule status --cached' befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later 9a780a384d mingw: spawned processes need to inherit only standard handles c5a03b1e29 mingw: work around incorrect standard handles eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool 43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values 2d05ef2778 sequencer: fix empty commit check when amending ea8b7be147 git svn: stop using `rebase --preserve-merges` 67a6ea6300 gpg-interface: limit search for primary key fingerprint 392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern cff4e9138d sparse-checkout: check for dirty status 416adc8711 sparse-checkout: update working directory in-process for 'init' f75a69f880 sparse-checkout: cone mode should not interact with .gitignore fb10ca5b54 sparse-checkout: write using lockfile 99dfa6f970 sparse-checkout: use in-process update for disable subcommand e091228e17 sparse-checkout: update working directory in-process e9de487aa3 sparse-checkout: sanitize for nested folders 4dcd4def3c unpack-trees: add progress to clear_ce_flags() eb42feca97 unpack-trees: hash less in cone mode af09ce24a9 sparse-checkout: init and set in cone mode 96cc8ab531 sparse-checkout: use hashmaps for cone patterns 879321eb0b sparse-checkout: add 'cone' mode e6152e35ff trace2: add region in clear_ce_flags 72918c1ad9 sparse-checkout: create 'disable' subcommand 7bffca95ea sparse-checkout: add '--stdin' option to set subcommand f6039a9423 sparse-checkout: 'set' subcommand d89f09c828 clone: add --sparse mode bab3c35908 sparse-checkout: create 'init' subcommand 94c0956b60 sparse-checkout: create builtin with 'list' subcommand 679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files df6d3d6802 lib-bash.sh: move `then` onto its own line 2a02262078 t5520: replace `! git` with `test_must_fail git` c245e58bb6 t5520: remove redundant lines in test cases a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp e959a18ee7 t5520: don't put git in upstream of pipe 5540ed27bc t5520: test single-line files by git with test_cmp dd0f1e767b t5520: use test_cmp_rev where possible 979f8891cc t5520: replace test -{n,z} with test-lib functions 3037d3db90 t5520: use test_line_count where possible 93a9bf876b t5520: remove spaces after redirect operator ceeef863de t5520: replace test -f with test-lib functions 4c8b046f82 t5520: let sed open its own input 53c62b9810 t5520: use sq for test case names e8d1eaf9b4 t5520: improve test style 2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals 8cb7980382 t0000: test multiple local assignment 5b583e6a09 format-patch: pass notes configuration to range-diff bd36191886 range-diff: pass through --notes to `git log` 9f726e1b87 range-diff: output `## Notes ##` header 3bdbdfb7a5 t3206: range-diff compares logs with commit notes 75c5aa0701 t3206: s/expected/expect/ 79f3950d02 t3206: disable parameter substitution in heredoc 3a6e48e9f7 t3206: remove spaces after redirect operators 26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish 077a1fda82 userdiff: support Python async functions 3798149a74 SubmittingPatches: use `--pretty=reference` 1f0fc1db85 pretty: implement 'reference' format 618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type 0df621172d pretty: provide short date format ac52d9410e t4205: cover `git log --reflog -z` blindspot 3e8ed3b93e pretty.c: inline initalize format_context 4982516451 revision: make get_revision_mark() return const pointer f0f9de2bd7 completion: complete `tformat:` pretty format fb2ffa77a6 SubmittingPatches: remove dq from commit reference bae74c9dfb pretty-formats.txt: use generic terms for hash bd00717eab SubmittingPatches: use generic terms for hash 9d45ac4cbf rev-list-options.txt: remove reference to --show-notes 828e829b9e argv-array: add space after `while` e440fc5888 commit: support the --pathspec-from-file option 66a25a7242 doc: commit: synchronize <pathspec> description 64bac8df97 reset: support the `--pathspec-from-file` option d137b50756 doc: reset: synchronize <pathspec> description 24e4750c96 pathspec: add new function to parse file 0dbc4a0edf ci(osx): update homebrew-cask repository with less noise e02058a729 sequencer: handle rebase-merges for "onto" message bae60ba7e9 builtin/unpack-objects.c: show throughput progress 2d92ab32fd rev-parse: make --show-toplevel without a worktree an error 9e5afdf997 fetch: add trace2 instrumentation 4c4066d95d run-command: move doc to run-command.h 6c51cb525d trace2: move doc to trace2.h 7db0305438 parse-options: add link to doc file in parse-options.h d95a77d059 submodule-config: move doc to submodule-config.h f3b9055624 credential: move doc to credential.h bbcfa3002a tree-walk: move doc to tree-walk.h 971b1f24a2 argv-array: move doc to argv-array.h f1ecbe0f53 trace: move doc to trace.h 13aa9c8b70 cache: move doc to cache.h c0be43f898 sigchain: move doc to sigchain.h 19ef3ddd36 pathspec: move doc to pathspec.h 301d595e72 revision: move doc to revision.h 3a1b3415d9 attr: move doc to attr.h 126c1ccefb refs: move doc to refs.h d27eb356bf remote: move doc to remote.h and refspec.h 405c6b1fbc sha1-array: move doc to sha1-array.h d3d7172e40 merge: move doc to ll-merge.h 3f1480b745 graph: move doc to graph.h and graph.c 266f03eccd dir: move doc to dir.h 13c4d7eb22 diff: move doc to diff.h and diffcore.h cd5522271f rebase -r: let `label` generate safer labels 867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()` 8c15904462 built-in add -i: implement the `help` command 3d965c7674 built-in add -i: use color in the main loop 68db1cbf8e built-in add -i: support `?` (prompt help) 76b743234c built-in add -i: show unique prefixes of the commands 6348bfba58 built-in add -i: implement the main loop a376e37b2c gitweb: escape URLs generated by href() b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI f28bceca75 t/gitweb-lib.sh: drop confusing quotes 0eba60c9b7 t9502: pass along all arguments in xss helper 932757b0cc INSTALL: use existing shell scripts as example b018719927 t7004: check existence of correct tag 1daaebcaa5 built-in add -i: color the header in the `status` command 5e82b9e4d2 built-in add -i: implement the `status` command e4cb659ebd diff: export diffstat interface f83dff60a7 Start to implement a built-in version of `git add --interactive` df53c80822 stash: make sure we have a valid index before writing it ad7a403268 send-pack: check remote ref status on pack-objects failure d91ce887c9 t6120-describe: correct test repo history graph in comment 1f9247a3bd completion: tab-complete "git svn --recursive" 603960b50e promisor-remote: remove fetch_if_missing=0 e362fadcd0 clone: remove fetch_if_missing=0 169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL 51bd6be32d mingw: use COPY_ARRAY for copying array 4bd0593e0f test-tool: use 'read-graph' helper e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway d784d978f6 t4215: use helper function to check output 61eea521fe fsmonitor: do not compare bitmap size with size of split index b19f3fe9dd hex: drop sha1_to_hex() c1ce9c06d0 completion: learn to complete `git rebase --onto=` f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase aa6d7f93ed hex: drop sha1_to_hex_r() 52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch 5772b0c745 sequencer: reencode old merge-commit message e0eba649e8 bundle-verify: add --quiet 79862b6b77 bundle-create: progress output control 73c3253d75 bundle: framework for options before bundle file 68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in" b375744274 sequencer: reencode squashing commit's message 019a9d8362 sequencer: reencode revert/cherry-pick's todo list 0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding 1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary d9f6f3b619 The first batch post 2.24 cycle 28014c1084 Merge branch 'bc/hash-independent-tests-part-6' 57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree' c22f63c40f Merge branch 'pb/pretty-email-without-domain-part' 5731ca3657 Merge branch 'hw/remove-api-docs-placeholder' 14b58c62bc Merge branch 'sg/commit-graph-usage-fix' eff313f8a7 Merge branch 'dl/apply-3way-diff3' db806d7064 Merge branch 'sg/dir-trie-fixes' f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix' 8f1119b988 Merge branch 'wb/midx-progress' d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes' 0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges' 8f40d89783 Merge branch 'hv/bitshift-constants-in-blame' d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head' 5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer' b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc' 15d9f3dc66 Merge branch 'es/walken-tutorial' 026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor' ed28358833 convert: use skip_iprefix() in validate_encoding() 89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding() 03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules ae821ffe83 multimail: fix a few simple spelling errors 557c5895c2 sha1dc: fix trivial comment spelling error aa74be316a Fix spelling errors in test commands 96c0caf5e3 Fix spelling errors in messages shown to users 4dc8b1c114 Fix spelling errors in names of tests 7a40cf1553 Fix spelling errors in comments of testcases 15beaaa3d1 Fix spelling errors in code comments a807200f67 userdiff: add Elixir to supported userdiff languages 461caf3e8a git-shortlog.txt: include commit limiting options 6462d5eb9a fetch: remove fetch_if_missing=0 46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion 99b2ba35f5 t0028: eliminate non-standard usage of printf add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` 14c4776d75 t: fix typo in test descriptions 270de6acbe t6024: modernize style 77363a51fb name-hash.c: remove duplicate word in comment c92faa4d22 hashmap: fix documentation misuses of -> versus . a6d39f2efb git-filter-branch.txt: correct argument name typo 4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators 8915297925 Fix spelling errors in documentation outside of Documentation/ 031fd4b93b Documentation: fix a bunch of typos, both old and new dd0b61f577 fsmonitor: fix watchman integration 5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare() 7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph c14e6e7903 fetch: add the command-line option `--write-commit-graph` da72936f54 Git 2.24 1d34d425d4 Merge branch 'bc/doc-use-docbook-5' dac1d83c91 Merge branch 'ds/commit-graph-on-fetch' c32ca691c2 Merge branch 'jt/delay-fetch-if-missing' ab6b50e4c8 Merge https://github.com/prati0100/git-gui 93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2 fe28ad8520 rebase: add --reset-author-date 08187b4cba rebase -i: support --ignore-date 0185c683c9 sequencer: rename amend_author to author_to_rename cbd8db17ac rebase -i: support --committer-date-is-author-date c068bcc59b sequencer: allow callers of read_author_script() to ignore fields ba51d2fb24 rebase -i: add --ignore-whitespace flag 3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower 3ada78de3f myfirstcontrib: add dependency installation step 4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt 4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly 8dfb04ae96 update-index: optionally leave skip-worktree entries alone 116d1fa6c6 vreportf(): avoid relying on stdio buffering efd5444238 RelNotes/2.24.0: fix self-contradictory note 391c7e40b5 fetch.c: fix typo in a warning message 55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template 849e43680d RelNotes/2.24.0: typofix 0115e5d929 git-diff.txt: document return code of `--no-index` 798d66e35d l10n: de.po: Update German translation c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u) f21f8f5d35 Git 2.24-rc2 8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix' 0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix' f2db52c46b Merge branch 'js/mingw-needs-hiding-fix' 5b7594abdc Merge branch 'master' of github.com:vnwildman/git 034d33653a Merge branch 'next' of github.com:ChrisADR/git-po 26b061007c submodule: teach set-url subcommand 460782b7be t7519-status-fsmonitor: improve comments d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses 4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config 1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694) f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0 762d5b4f46 help: add gitsubmodules to the list of guides 76a53d640f git_path(): handle `.lock` files correctly 3ce47211a6 t1400: wrap setup code in test case 44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string 6c02042139 clone: rename static function `dir_exists()`. 8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command 77200e9332 l10n: es: 2.24.0 round 2 e42df36b42 Merge branch 'l10n/it/update-italian-translation' 5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2 51728480fe l10n: fr v2.24.0 rnd2 045a548698 l10n: git.pot: v2.24.0 round 2 (1 new) 468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree() c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit() 103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag() f648ee7088 fsck: rename vague "oid" local variables cc579000bf fsck: don't require an object struct in verify_headers() 7854399366 fsck: don't require an object struct for fsck_ident() b8b00f1693 fsck: drop blob struct from fsck_finish() 6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob() 38370253fd fsck: don't require an object struct for report() f59793763d fsck: only require an oid for skiplist functions 5afc4b1dc6 fsck: only provide oid/type in fsck_error callback 82ef89b318 fsck: don't require object structs for display functions 733902905d fsck: use oids rather than objects for object_name API d40bbc109b fsck_describe_object(): build on our get_object_name() primitive a59cfb3230 fsck: unify object-name code 23a173a761 fsck: require an actual buffer for non-blobs 2175a0c601 fsck: stop checking tag->tagged ec65231571 fsck: stop checking commit->parent counts 1de6007d85 fsck: stop checking commit->tree value 228c78fbd4 commit, tag: don't set parsed bit for parse failures 60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()` 8b656572ca builtin/commit-graph.c: remove subcommand-less usage string fa26d5ede6 t4048: abstract away SHA-1-specific constants cf02be8486 t4045: make hash-size independent 38ee26b2a3 t4044: update test to work with SHA-256 37ab8ebef1 t4039: abstract away SHA-1-specific constants 0370b35414 t4038: abstract away SHA-1 specific constants 0253e126a2 t4034: abstract away SHA-1-specific constants 45e2ef2b1d t4027: make hash-size independent 79b0edc1a0 t4015: abstract away SHA-1-specific constants 840624ff55 t4011: abstract away SHA-1-specific constants 32a6707267 t4010: abstract away SHA-1-specific constants 440bf91dfa t3429: remove SHA1 annotation 0b408ca2bd t1305: avoid comparing extensions 2eabd38313 rev-parse: add a --show-object-format option 52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode 45e206f0d8 t4203: use test-lib.sh definitions 2ae4944aac t6006: use test-lib.sh definitions cb99a34e23 commit-graph: fix writing first commit-graph during fetch e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug 7b4fb434b4 documentation: remove empty doc files 566a1439f6 Git 2.24-rc1 04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix' 4d6fb2beeb Merge branch 'ds/feature-macros' 5f0b6ed907 Merge branch 'js/azure-ci-osx-fix' c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs' 1b4f85285f Merge branch 'dl/submodule-set-branch' c7aadccba0 fetch: delay fetch_if_missing=0 until after config c11e9966cb repo-settings: read an int for index.version 091489d068 apply: respect merge.conflictStyle in --3way aa76ae4905 t4108: demonstrate bug in apply 95806205cd t4108: use `test_config` instead of `git config` b0069684d4 t4108: remove git command upstream of pipe fa87b81385 t4108: replace create_file with test_write_lines 7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job 6c96630cb0 config: move documentation to config.h d81542e6f3 Eleventh batch e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix' d45d771978 Merge branch 'bc/smart-http-atomic-push' 22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix' 2e215b7959 Merge branch 'sb/userdiff-dts' e3cf08361a Merge branch 'sg/progress-fix' b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix' c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc' f45f88b2e4 path.c: don't call the match function without value in trie_find() c72fc40d09 path.c: clarify two field names in 'struct common_dir' 8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file 7cb8c929d7 path.c: clarify trie_find()'s in-code comment e536b1fedf Documentation: mention more worktree-specific exceptions 680cba2c2b multi-pack-index: add [--[no-]progress] option. 64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file 8dc18f8937 midx: add progress to expire_midx_packs 840cef0c70 midx: add progress to write_midx_file efbc3aee08 midx: add MIDX_PROGRESS flag 0eb3671ed9 ci(osx): use new location of the `perforce` cask da1e295e00 t604[236]: do not run setup in separate tests 49b8133a9e merge-recursive: fix merging a subdirectory into the root directory d3eebaad5e merge-recursive: clean up get_renamed_dir_portion() 80736d7c5e doc: am --show-current-patch gives an entire e-mail message a8e2c0eadc t7419: change test_must_fail to ! for grep 19c29e538e t4014: make output-directory tests self-contained 12a4aeaad8 Merge branch 'js/azure-pipelines-msvc' 399c23c046 ci(visual-studio): actually run the tests in parallel 711cd6d15c ci(visual-studio): use strict compile flags, and optimization 370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0 cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master 907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master 13bcea8c7f l10n: fr 2.24.0 rnd 1 135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master 3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) 8da56a4848 userdiff: fix some corner cases in dts regex 86795774bb builtin/blame.c: constants into bit shift format feebd2d256 rebase: hide --preserve-merges option 0e40a73a4c Doc: Bundle file usage 78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error 12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error 2b6f6ea1bd test-progress: fix test failures on big-endian systems f757409e36 l10n: bg.po: Updated Bulgarian translation (4693) 176f5adfdb completion: clarify installation instruction for zsh d966095db0 Git 2.24-rc0 90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array' 3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth' d0258d0944 Merge branch 'rs/http-push-simplify' bb52def6da Merge branch 'jj/stash-reset-only-toplevel' f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs' e5fca6b573 Merge branch 'bb/compat-util-comment-fix' 43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup' 07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely' 2d74d28ee0 Merge branch 'dl/compat-cleanup' 9b83a94829 Merge branch 'ta/t1308-typofix' 376012c919 Merge branch 'js/doc-stash-save' 10da030ab7 grep: avoid leak of chartables in PCRE2 513f2b0bbd grep: make PCRE2 aware of custom allocator 57d4660468 grep: make PCRE1 aware of custom allocator d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand 8af69cf3e2 t3301: test diagnose messages for too few/many paramters 6f1194246a remote-curl: pass on atomic capability to remote side bbb13e8188 graph: fix coloring of octopus dashes 92beecc136 graph: flatten edges that fuse with their right neighbor 479db18bc0 graph: smooth appearance of collapsing edges on commit lines 0195285b95 graph: rename `new_mapping` to `old_mapping` d62893ecc1 graph: commit and post-merge lines for left-skewed merges 0f0f389f12 graph: tidy up display of left-skewed merges 458152cce1 graph: example of graph output that can be simplified ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state 46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()` a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()` 9157a2a032 graph: reuse `find_new_column_by_commit()` 210179a20d graph: handle line padding in `graph_next_line()` fbccf255f9 graph: automatically track display width of graph lines 5374a290aa fetch-pack: write fetched refs to .promisor 4627bc777e sequencer: run post-commit hook 49697cb721 move run_commit_hook() to libgit and use it there 12bb7a540a sequencer.h fix placement of #endif 6a619ca03c t3404: remove uneeded calls to set_fake_editor b2dbacbddf t3404: set $EDITOR in subshell 88a92b6c73 t3404: remove unnecessary subshell bf8e65b30b format-patch: teach --cover-from-description option a92331df18 format-patch: use enum variables 46273df7bf format-patch: replace erroneous and condition 3b3c79f6c9 diff-highlight: fix a whitespace nit 108b97dc37 Ninth batch cbe8cdd3a0 Merge branch 'jk/coc' 3b9ec27919 Merge branch 'js/trace2-fetch-push' c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch' 1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup' eb3de5b823 Merge branch 'js/xdiffi-comment-updates' 4e8371ec26 Merge branch 'dl/t0000-skip-test-test' b6d712fa4e Merge branch 'tg/range-diff-output-update' 77458870a5 Merge branch 'gs/sq-quote-buf-pretty' 5efabc7ed9 Merge branch 'ew/hashmap' d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files' 6ed610b968 Merge branch 'am/t0028-utf16-tests' 5b900fb812 Merge branch 'dl/octopus-graph-bug' 16d9d7184b Merge branch 'en/fast-imexport-nested-tags' 6d5291be45 Merge branch 'js/azure-pipelines-msvc' ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd' d96e31e390 Merge branch 'js/fetch-jobs' 280bd44551 Merge branch 'en/merge-recursive-cleanup' 062a309d36 remote-curl: use argv_array in parse_push() a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes 5cc6a4be11 http-push: simplify deleting a list item 556895d0c8 stash: avoid recursive hard reset on submodules b524f6b399 Merge branch 'ka/japanese-translation' f6f3824b4e git-gui: improve Japanese translation 61f4b407d3 Merge branch 'py/readme' 1e6880fd06 git-gui: add a readme edefc31873 format-patch: create leading components of output directory 68b69211b2 git-compat-util: fix documentation syntax fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth() e0479fa073 documentation: add tutorial for object walking 3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed 4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target 9cad1c4488 pthread.h: manually align parameter lists 8c1cfd58e3 t1308-config-set: fix a test that has a typo 57d8f4b4c7 doc(stash): clarify the description of `save` 08da6496b6 Eighth batch 07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup' f0d407e6ae Merge branch 'kt/add-i-progress' 66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree' a4c5d9f66e Merge branch 'rs/dedup-includes' 159cdabd87 Merge branch 'js/range-diff-noprefix' 93424f1f7d Merge branch 'cb/pcre1-cleanup' a73f91774c Merge branch 'ab/pcre-jit-fixes' 4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword' 020011f2cb Merge branch 'tk/git-svn-trim-author-name' 676278f8ea Merge branch 'bc/object-id-part17' aafb75452b Merge branch 'en/clean-nested-with-ignored' 3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails 5cdf2301d4 add a Code of Conduct document 70bf0b755a Seventh batch 9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat' 2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary' d17f54947d Merge branch 'rs/convert-fix-utf-without-dash' 82c80f98e6 Merge branch 'py/git-gui-has-maintainer' 6e12570822 Merge branch 'ah/cleanups' 772cad0afb Merge branch 'js/diff-rename-force-stable-sort' 424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path' 678a9ca629 Merge branch 'as/shallow-slab-use-fix' 0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix' 042a54d251 Merge branch 'am/visual-studio-config-fix' 03d3b1297c xdiffi: fix typos and touch up comments b05b40930e t0000: cover GIT_SKIP_TESTS blindspots d8bc1a518a send-pack: never fetch when checking exclusions 756fb0dedb t4014: treat rev-list output as the expected value 2b6a9b13ca range-diff: don't segfault with mode-only changes 360c7ba330 transport: push codepath can take arbitrary repository ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments b657047719 merge-recursive: fix the fix to the diff3 common ancestor label b744c3af07 Sixth batch 417056578a Merge branch 'bw/submodule-helper-usage-fix' 9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check' 1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a' 59b19bcd9f Merge branch 'cc/multi-promisor' 1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' 5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort' eb35c18e42 Merge branch 'sg/travis-help-debug' cabb145fe3 Merge branch 'rs/alias-use-copy-array' 56c7ab0f4e Merge branch 'sg/t-helper-gitignore' e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang' 583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules' 337e3f2b49 Merge branch 'rs/nth-switch-code-simplification' 8f53fe1733 Merge branch 'hb/hg-to-git-py3' ef93bfbd45 Merge branch 'sg/progress-fix' 980351d1ac Merge branch 'js/doc-patch-text' 80693e3f09 Merge branch 'tb/commit-graph-harden' ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge' 3f84633563 Merge branch 'dl/cocci-everywhere' caf150ce7d Merge branch 'gs/commit-graph-progress' 1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim' 1398171378 Merge branch 'rs/commit-graph-use-list-count' 773521df26 Merge branch 'rs/nth-parent-parse' 7f17913161 Merge branch 'dl/submodule-set-branch' cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix' bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees' 098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack' 37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc' e392382f95 Merge branch 'dl/complete-rebase-and-archive' cda8faa37e Merge branch 'jk/commit-graph-cleanup' 36d2fca82b Merge branch 'ss/get-time-cleanup' ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude' ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob' ba2d451122 Merge branch 'tg/stash-refresh-index' e2b5038d87 hashmap_entry: remove first member requirement from docs 404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry 23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators c8e424c9c9 hashmap: introduce hashmap_free_entries 8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry * 87571c3f71 hashmap: use *_entry APIs for iteration 939af16eac hashmap_cmp_fn takes hashmap_entry params f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *" f0e63c4113 hashmap: use *_entry APIs to wrap container_of 6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *" 973d5eea74 introduce container_of macro 26b455f21e hashmap_put takes "struct hashmap_entry *" 28ee794128 hashmap_remove takes "const struct hashmap_entry *" b6c5241606 hashmap_get takes "const struct hashmap_entry *" b94e5c1df6 hashmap_add takes "struct hashmap_entry *" f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *" d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *" d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry 12878c8351 coccicheck: detect hashmap_entry.hash assignment e010a41216 diff: use hashmap_entry_init on moved_entry.ent f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo" de5abb5f7a git-p4: auto-delete named temporary file c90b652afd Fifth batch f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1' b0f8aed48f Merge branch 'ma/user-manual-markup-update' faf5576a8d Merge branch 'bc/doc-use-docbook-5' 314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes' 70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo' 847650798b Merge branch 'am/mailmap-andrey-mazo' 1a155f2e66 Merge branch 'jc/git-gui-has-maintainer' 1bcef51204 t/oid-info: add empty tree and empty blob values ecde49bb8a t/oid-info: allow looking up hash algorithm name 11a3d3aadd git-rev-list.txt: prune options in synopsis 7d2f003ee4 Documentation: update the location of the git-gui repo b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding() 46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines b35304bf95 ci: really use shallow clones on Azure Pipelines ab7d854aba tests: let --immediate and --write-junit-xml play well together be5d88e112 test-tool run-command: learn to run (parts of) the testsuite 5d65ad17a9 vcxproj: include more generated files 030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built 61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable() e4347c9434 msvc: handle DEVELOPER=1 ed712ef8d5 msvc: ignore some libraries when linking 5b8f9e2417 compat/win32/path-utils.h: add #include guards 41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning c097b95a26 msvc: avoid using minus operator on unsigned types dfd557c978 stash apply: report status correctly even in a worktree's subdirectory d54dea77db fetch: let --jobs=<n> parallelize --multiple, too 87db61a436 trace2: write discard message to sentinel files 83e57b04e6 trace2: discard new traces if target directory has too many files 11c21f22de t4214: demonstrate octopus graph coloring failure 25eb905e14 t4214: explicitly list tags in log 63be8c8dd7 t4214: generate expect in their own test cases a7a5590c6e t4214: use test_merge 94ba151300 test-lib: let test_merge() perform octopus merges 22541013d0 docs: clarify trace2 version invariants 3d4548e7e2 docs: mention trace2 target-dir mode in git-config 2fe44394c8 treewide: remove duplicate #include directives dbcd970c27 push: do not pretend to return `int` from `die_push_simple()` 941790d7de fast-export: handle nested tags 8d7d33c1ce t9350: add tests for tags of things other than a commit a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags 208d69246e fast-export: add support for --import-marks-if-exists b8f50e5b60 fast-import: add support for new 'alias' command f73b2aba05 fast-import: allow tags to be identified by mark labels 3164e6bd24 fast-import: fix handling of deleted tags 8085050ab4 add -i: show progress counter in the prompt 69fdb922ad Merge branch 'bw/diff3-conflict-style' b436825b9b git-gui: support for diff3 conflict style 937b76ed49 range-diff: internally force `diff.noprefix=true` 411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job 25e4b8099c push: add trace2 instrumentation 5fc31180d8 fetch: add trace2 instrumentation 53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value c3b57dc2a0 git-gui: use existing interface to query a path's attribute 45ab460d4a Merge branch 'js/git-bash-if-available' 0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command 71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only) 54a80a9ad8 wrapper: use a loop instead of repetitive statements baed6bbb5b diffcore-break: use a goto instead of a redundant if statement 8da02ce62a commit-graph: remove a duplicate assignment ddb3c856f3 shallow.c: don't free unallocated slabs 8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits 65904b8b2b promisor-remote: skip move_to_tail when no-op 2049b8dc65 diffcore_rename(): use a stable sort 97fff61012 Move git_sort(), a stable sort, into into libgit.a 69f272b922 dir: special case check for the possibility that pathspec is NULL 6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available bc12974a89 Fourth batch 5a5350940b Merge branch 'ds/commit-graph-on-fetch' 974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch' 9755f70fe6 Merge branch 'ds/include-exclude' 93fc8760e7 Merge branch 'jh/trace2-pretty-output' 640f9cd599 Merge branch 'dl/rebase-i-keep-base' 026428c35e Merge branch 'sg/clean-nested-repo-with-ignored' 21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip' d693345518 Merge branch 'dl/use-sq-from-test-lib' d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes' 2be6ccc01a Merge branch 'sg/git-test-boolean' cf861cd7a0 Merge branch 'rs/get-tagged-oid' 91243b019d Merge branch 'en/filter-branch-deprecation' 9bc67b6658 Merge branch 'en/merge-options-ff-and-friends' fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden' cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option' 8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return' 3ff6af7753 Merge branch 'nd/switch-and-restore' aadac067aa Merge branch 'tb/file-url-to-unc-path' b57a88a5f1 Merge branch 'js/gitdir-at-unc-root' 6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path' 430439536b Merge branch 'rs/parse-tree-indirect' 991fd97b9a Merge branch 'jk/fast-import-history-bugfix' 74a39b9bcc Merge branch 'mh/notes-duplicate-entries' 37801f0665 Merge branch 'tb/banned-vsprintf-namefix' 21ce0b48f3 Merge branch 'mh/release-commit-memory-fix' f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup' bf6136cab8 Merge branch 'rs/strbuf-detach' a2e22bb3ad Merge branch 'rs/trace2-dst-warning' 1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup' 0281733483 Merge branch 'bc/hash-independent-tests-part-5' f06fb376ed Merge branch 'jc/test-cleanup' 00bb74453d Merge branch 'dl/compat-cleanup' 59438be06c Merge branch 'js/visual-studio' cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone' af2abd870b fast-export: fix exporting a tag and nothing else c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit fd5b820d9c user-manual.txt: change header notation e79b34533a user-manual.txt: add missing section label b503a2d515 Makefile: emulate compile in $(HCO) target better af26e2a9d2 pack-bitmap.h: remove magic number b06fdead04 promisor-remote.h: include missing header 97b989ee3a apply.h: include missing header 4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name d928a8388a t0028: add more tests 0b63fd6965 t0028: fix test for UTF-16-LE-BOM fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration 2e09c01232 name-rev: avoid cutoff timestamp underflow 8464f94aeb promisor-remote.h: drop extern from function declaration 75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp 24c681794f doc: MyFirstContribution: fix cmd placement instructions c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode 60c60b627e Merge branch 'py/git-git-extra-stuff' faf420e05a treewide: correct several "up-to-date" to "up to date" b71c6c3b64 Fix build with core.autocrlf=true 16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff 26e3d1cbea .mailmap: update email address of Andrey Mazo 27ea41c0b4 t/helper: ignore only executable files 7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias() 83e3ad3b12 merge-recursive: symlink's descendants not in way 34933d0eff stash: make sure to write refreshed cache e080b34540 merge: use refresh_and_write_cache 22184497a3 factor out refresh_and_write_cache function 7371612255 commit-graph: add --[no-]progress to write and verify 47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW 253bfe49bd SubmittingPatches: git-gui has a new maintainer d17ae00c97 hg-to-git: make it compatible with both python3 and python2 4c86140027 Third batch f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http' 627b826834 Merge branch 'md/list-objects-filter-combo' b9ac6c59b8 Merge branch 'cc/multi-promisor' de67293e74 Merge branch 'sg/line-log-tree-diff-optim' 95486229e3 Merge branch 'sg/complete-configuration-variables' f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook' a2e524ecf3 Merge branch 'cb/curl-use-xmalloc' 128666753b Merge branch 'jk/drop-release-pack-memory' 917a319ea5 Merge branch 'js/rebase-r-strategy' 7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui 4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout() 0d4304c124 doc: fix reference to --ignore-submodules af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py 8a3a6817e2 Merge gitk to pick up emergency build fix 2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po 9027af58e2 Makefile: run coccicheck on more source files 43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES) 5dedf7de53 Makefile: define THIRD_PARTY_SOURCES 902b90cf42 clean: fix theoretical path corruption ca8b5390db clean: rewrap overly long line 09487f2cba clean: avoid removing untracked files in a nested git repository e86bbcf987 clean: disambiguate the definition of -d 3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run 29b577b960 dir: add commentary explaining match_pathspec_item's return value 89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case 404ebceda0 dir: also check directories for matching pathspecs a5e916c745 dir: fix off-by-one error in match_pathspec_item bbbb6b0b89 dir: fix typo in comment 7541cc5302 t7300: add testcases showing failure to clean specified pathspecs 0eb7c37a8a diff, log doc: small grammer, format, and language fixes 6fae6bd518 diff, log doc: say "patch text" instead of "patches" 2bb74b53a4 Test the progress display bbf47568ad Revert "progress: use term_clear_line()" cf6a2d2557 Makefile: strip leading ./ in $(LIB_H) b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup 689a146c91 commit-graph: use commit_list_count() 59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N" a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N" a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base" cf34337f98 list-objects-filter: give a more specific error sparse parsing error 4c96a77594 list-objects-filter: delay parsing of sparse oid 72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter 83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer 7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>` 226daba280 Doc/Makefile: give mansource/-version/-manual attributes 40e747e89d git-submodule.txt: fix AsciiDoc formatting error f6461b82b9 Documentation: fix build with Asciidoctor 2 3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk f7a8834ba4 Merge branch 'bp/amend-toggle-bind' ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit" 9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog beffae768a gitk: Add Chinese (zh_CN) translation 56d9cbe68b packfile: expose get_delta_base() bab28d9f97 builtin/pack-objects: report reused packfile objects 6c8ec8c30a Merge branch 'bw/commit-scrollbuffer' acfa495519 Merge branch 'bw/amend-checkbutton' da08d559b7 git-gui: add horizontal scrollbar to commit buffer ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton aeeb978ba6 completion: teach archive to use __gitcomp_builtin 2b9bd488ae completion: teach rebase to use __gitcomp_builtin d49dffde9a completion: add missing completions for log, diff, show 6abada1880 upload-pack: disable commit graph more gently for shallow traversal fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time 72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set 4fd39c76e6 doc: minor formatting fix 29f4332e66 Quit passing 'now' to date code c77abf0460 Merge branch 'py/revert-hunks-lines' 5a2bb62180 Merge branch 'bp/widget-focus-hotkeys' e07446ed5f git-gui: add hotkeys to set widget focus f981ec18cf cache-tree: do not lazy-fetch tentative tree f1d4a28250 Second batch c8ada15456 Merge branch 'bc/reread-attributes-during-rebase' 8f3ba423e7 Merge branch 'tg/t0021-racefix' a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email' d49c2c3466 Merge branch 'sb/userdiff-dts' 2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe' 4c49dd042d Merge branch 'nd/diff-parseopt' d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix' 8ce8a63b46 Merge branch 'ds/midx-expire-repack' 9437394661 Merge branch 'cb/fetch-set-upstream' af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix' fa9e7934c7 Merge branch 'bm/repository-layout-typofix' d1a251a1fa Merge branch 'en/checkout-mismerge-fix' e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental' f4f8dfe127 Merge branch 'ds/feature-macros' 4a12f89865 Merge branch 'jk/eoo' b4a1eec332 Merge branch 'jk/repo-init-cleanup' 70336bd50a Merge branch 'py/git-gui-do-quit' ad7c543e3b grep: skip UTF8 checks explicitly 0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration() b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration 4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor b7e1ba5649 git-merge-index.txt: wrap shell listing in "----" 38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----" 5371813768 git-ls-remote.txt: wrap shell listing in "----" 1925fe0c8a Documentation: wrap config listings in "----" 922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor 2017956a19 Documentation: wrap blocks with "--" dd2e50a84e commit-graph: turn off save_commit_buffer 67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits 806278dead commit-graph.c: handle corrupt/missing trees 16749b8dd2 commit-graph.c: handle commit parsing errors 23424ea759 t/t5318: introduce failing 'git commit-graph write' tests bf1e28e0ad builtin/rebase.c: Remove pointless message d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing bd482d6e33 t: use common $SQ variable 3a37876b5d pack-objects: drop packlist index_pos optimization 7e6b96c73b test-read-cache: drop namelen variable e4b369069e diff-delta: set size out-parameter to 0 for NULL delta 7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint f1cbd033e2 pack-objects: use object_id in packlist_alloc() 0dfed92dfd git-am: handle missing "author" when parsing commit 3960290675 ci: restore running httpd tests 6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests c77722b3ea use get_tagged_oid() dad3f0607b tag: factor out get_tagged_oid() 468ce99b77 unpack-trees: rename 'is_excluded_from_list()' 65edd96aec treewide: rename 'exclude' methods to 'pattern' 4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_' caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list' ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern' 483e861111 t9902: use a non-deprecated command for testing 9df53c5de6 Recommend git-filter-repo instead of git-filter-branch 7b6ad97939 t6006: simplify, fix, and optimize empty message test 50094ca45f config/format.txt: specify default value of format.coverLetter c1a6f21cd4 Doc: add more detail for git-format-patch 854b5cb46a t4014: stop losing return codes of git commands dd2b6b6860 t4014: remove confusing pipe in check_threading() 6bd26f58ea t4014: use test_line_count() where possible c6ec6dadba t4014: let sed open its own files f2e2fa8f60 t4014: drop redirections to /dev/null 460609cbd5 t4014: use indentable here-docs 92014b69bb t4014: remove spaces after redirect operators 0ab74e979c t4014: use sq for test case names cb46c40662 t4014: move closing sq onto its own line b562a54c01 t4014: s/expected/expect/ e770fbfeff t3005: remove unused variable da280f5f1a t: use LF variable defined in the test harness 7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch 552fc5016f mingw: apply array.cocci rule 476998d05b t3427: accelerate this test by using fast-export and fast-import aac6ff7b5b .gitignore: stop ignoring `.manifest` files 2c65d90f75 am: reload .gitattributes after patching it 1577dc0f7c tree: simplify parse_tree_indirect() 50f26bd035 fetch: add fetch.writeCommitGraph config setting 8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set 27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options 0a8bc7068f clarify documentation for remote helpers 80e3658647 help: make help_unknown_ref() NORETURN 313677627a checkout: add simple check for 'git checkout -b' 3441de5b9c gitk: Make web links clickable a4fa2f0a4c git-gui: allow undoing last revert 414d924beb rebase: teach rebase --keep-base 6330209d7d rebase tests: test linear branch topology 4effc5bc96 rebase: fast-forward --fork-point in more cases c0efb4c1dd rebase: fast-forward --onto in more cases 2b318aa6c3 rebase: refactor can_fast_forward into goto tower c9efc21683 t3432: test for --no-ff's interaction with fast-forward 1ebec8dfc1 fast-import: duplicate into history rather than passing ownership 9756082b3c fast-import: duplicate parsed encoding string 86ae43da6a status: mention --skip for revert and cherry-pick b1b16bba96 completion: add --skip for cherry-pick and revert deaa65a754 completion: merge options for cherry-pick and revert 4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests 793ac7e309 t3432: test rebase fast-forward behavior 359ecebc34 t3431: add rebase --fork-point tests 502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage ff61681b46 grep: refactor and simplify PCRE1 support 8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1 1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning() fd99c2dd9b grep: use return value of strbuf_detach() 82f51af345 log-tree: always use return value of strbuf_detach() 7e92756751 http: don't leak urlmatch_config.vars 9784f97321 commit: free the right buffer in release_commit_memory ce17feb1b3 path: add a function to check for path suffix 60d198d022 banned.h: fix vsprintf()'s ban message 60fe477a0b notes: avoid potential use-after-free during insertion 779ad6641b notes: avoid leaking duplicate entries 4e1a641ee3 mingw: fix launching of externals from Unicode paths 5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly e2683d51d9 Fix .git/ discovery at the root of UNC shares d17f2124a7 setup_git_directory(): handle UNC paths correctly ebb8d2c90f mingw: support UNC in git clone file://server/share/repo 0c37c41d13 t4009: make hash size independent c1f3dfcc23 t4002: make hash independent 8cc5ff83c3 t4000: make hash size independent c784815073 t3903: abstract away SHA-1-specific constants 2ccdfb1c78 git-gui: return early when patch fails to apply 62bd99934b git-gui: allow reverting selected hunk 5f0a516de9 git-gui: allow reverting selected lines fddf2ebe38 transport: teach all vtables to allow fetch first ac3fda82bf transport-helper: skip ls-refs if unnecessary 745f681289 First batch after Git 2.23 d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg' 22e86e85cb Merge branch 'en/fast-import-merge-doc' 9c7573581c Merge branch 'jk/perf-no-dups' 4336fdb2ef Merge branch 'rs/nedalloc-fixlets' 8ae7a46c4d Merge branch 'sg/show-failed-test-names' 6ba06b582b Merge branch 'sg/commit-graph-validate' 072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix' 207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix' 77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests' 1b01cdbf2e Merge branch 'jk/tree-walk-overflow' 8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix' 307179732d Merge branch 'mt/grep-submodules-working-tree' 58166c2e9d t0021: make sure clean filter runs 8b3f33ef11 ref-filter: initialize empty name or email fields 3c81760bc6 userdiff: add a builtin pattern for dts files fe49814409 t4014: drop unnecessary blank lines from test cases a2bb801f6a line-log: avoid unnecessary full tree diffs eef5204190 line-log: extract pathspec parsing from line ranges into a helper function a63694f523 diff: skip GITLINK when lazy fetching missing objs 7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe 19800bdc3f parseopt: move definition of enum parse_opt_result up 415b770b88 packfile.h: drop extern from function declaration acb49d1cc8 t3800: make hash-size independent ca6ba94200 t3600: make hash size independent 19ce5496c2 t3506: make hash independent 9a6738c061 t3430: avoid hard-coded object IDs 4dd1b5f90f t3404: abstract away SHA-1-specific constants b99bfc7a6c t3306: abstract away SHA-1-specific constants e3e9d02e35 t3305: make hash size independent b408cf8cf6 t3301: abstract away SHA-1-specific constants b561edd213 t3206: abstract away hash size constants a5f61c7d13 t3201: abstract away SHA-1-specific constants 1c24a54ea4 repository-layout.txt: correct pluralization of 'object' b0a3186140 sequencer: simplify root commit creation a47ba3c777 rebase -i: check for updated todo after squash and reword 450efe2d53 rebase -i: always update HEAD before rewording c581e4a749 grep: under --debug, show whether PCRE JIT is enabled aaa95dfa05 midx: switch to using the_hash_algo be8e172e9f builtin/show-index: replace sha1_to_hex 3f34d70d40 rerere: replace sha1_to_hex fc06be3b7f builtin/receive-pack: replace sha1_to_hex 69fa337060 builtin/index-pack: replace sha1_to_hex 3a4d7aa5ae packfile: replace sha1_to_hex e0cb7cdb89 wt-status: convert struct wt_status to object_id 8d4d86b0f0 cache: remove null_sha1 f6ca67d673 builtin/worktree: switch null_sha1 to null_oid dd336a5511 builtin/repack: write object IDs of the proper length 894c0f66bb pack-write: use hash_to_hex when writing checksums 4439c7a360 sequencer: convert to use the_hash_algo 95518faac1 bisect: switch to using the_hash_algo e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo fe9fec45f6 config: use the_hash_algo in abbrev comparison 976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo 703d2d4193 bundle: switch to use the_hash_algo 9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo 7962e046ff show-index: switch hard-coded constants to the_hash_algo fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ 7e0d029f18 builtin/rev-parse: switch to use the_hash_algo 319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo f6af19a9ad fetch-pack: use parse_oid_hex 36261e42ec patch-id: convert to use the_hash_algo 28ba1830d0 builtin/replace: make hash size independent 24bc1a1292 pull, fetch: add --set-upstream option 71d41ff651 archive-tar: turn length miscalculation warning into BUG 17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header() 82a46af13e archive-tar: fix pax extended header length calculation 4060c1990a archive-tar: report wrong pax extended header length 4615a8cb5b merge-recursive: alphabetize include list 45ef16f77a merge-recursive: add sanity checks for relevant merge_options f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* 5bf7e5779e merge-recursive: split internal fields into a separate struct e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output a779fb829b merge-recursive: comment and reorder the merge_options fields 8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options 7c0a6c8e47 merge-recursive: move some definitions around to clean up the header c749ab1da8 merge-recursive: rename merge_options argument to opt in header bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list 4d7101e25c merge-recursive: fix some overly long lines 724dd767b2 cache-tree: share code between functions writing an index as a tree 345480d1ed merge-recursive: don't force external callers to do our logging b4db8a2b76 merge-recursive: remove useless parameter in merge_trees() 98a1d3d888 merge-recursive: exit early if index != head 9822175d2b Ensure index matches head before invoking merge machinery, round N 10f751c06b merge-recursive: remove another implicit dependency on the_repository f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks 8e01251694 merge-recursive: introduce an enum for detect_directory_renames values 743474cbfa merge-recursive: provide a better label for diff3 common ancestor 51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u) 5bace62582 l10n: Update Catalan translation 139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees() 65c01c6442 checkout: provide better conflict hunk description with detached HEAD d8523ca1b9 merge-recursive: be consistent with assert acb7da05ac checkout: remove duplicate code 93b980e58f http: use xmalloc with cURL 64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental aaf633c2ad repo-settings: create feature.experimental setting c6cc4c5afd repo-settings: create feature.manyFiles setting ad0fb65999 repo-settings: parse core.untrackedCache 31b1de6a09 commit-graph: turn on commit-graph by default b068d9a250 t6501: use 'git gc' in quiet mode 7211b9e753 repo-settings: consolidate some config settings 507e5470a0 worktree remove: clarify error message on dirty worktree 5af9d5f6c8 completion: complete config variables and values for 'git clone --config=' 88cd790d6a completion: complete config variables names and values for 'git clone -c' dd33472831 completion: complete values of configuration variables after 'git -c var=' e1e00089da completion: complete configuration sections and variable names for 'git -c' 42d0efec59 completion: split _git_config() d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp() 2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names d9438873c4 completion: deduplicate configuration sections 7a09a8f093 completion: add tests for 'git config' completion 840d7e5b3c completion: complete more values of more 'color.*' configuration variables 08a12175d8 completion: fix a typo in a comment 9827d4c185 packfile: drop release_pack_memory() d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed 362f8b280c t/perf: rename duplicate-numbered test script 742ed63345 trace2: cleanup whitespace in perf format e34430556c trace2: cleanup whitespace in normal format c2b890aca5 quote: add sq_append_quote_argv_pretty() ad43e37839 trace2: trim trailing whitespace in normal format error message 04f10d332f trace2: remove dead code in maybe_add_string_va() da4589ce7e trace2: trim whitespace in region messages in perf target format 0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit 5440eb0ea2 git-gui: call do_quit before destroying the main window bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook 6098817fd7 git-merge: honor pre-merge-commit hook a1f3dd7eb3 merge: do no-verify like commit f78f6c7e0c t7503: verify proper hook execution 70597e8386 nedmalloc: avoid compiler warning about unused value c9b9c09dae nedmalloc: do assignments only after the declaration section 22932d9169 config: stop checking whether the_repository is NULL 5732f2b1ef common-main: delay trace2 initialization 58ebccb478 t1309: use short branch name in includeIf.onbranch test 67feca3b1c gitcli: document --end-of-options 51b4594b40 parse-options: allow --end-of-options as a synonym for "--" 19e8789b23 revision: allow --end-of-options to end option parsing ffe1afe67c tests: show the test name and number at the start of verbose output 96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests 7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits' 39d8831856 commit-graph: turn a group of write-related macro flags into an enum 9916073be5 t5318-commit-graph: use 'test_expect_code' 620c09e1b6 restore: add test for deleted ita files ecd72042de checkout.c: unstage empty deleted ita files a613d4f817 pack-refs: always refresh after taking the lock file decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd' 371df1bea9 trace2: cleanup column alignment in perf target format 5aa02f9868 tree-walk: harden make_traverse_path() length computations c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path() b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len() 37806080d7 tree-walk: use size_t consistently 7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh' 12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh' 9055384710 tree-walk: drop oid from traverse_info 947208b725 setup_traverse_info(): stop copying oid e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` a63f990d92 t3418: test `rebase -r` with merge strategies 5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges` e145d99347 rebase -r: support merge strategies other than `recursive` 4e6023b13a t3427: fix another incorrect assumption f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced a9c71073da t3427: fix erroneous assumption b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case c248d32cdb t3427: simplify the `setup` test case significantly 8c1e24048a t3427: add a clarifying comment 5efed0ecf9 rebase: fold git-rebase--common into the -p backend 68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone 2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive` 6180b20239 t3400: stop referring to the scripted rebase d5b581f228 Drop unused git-rebase--am.sh 814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation 6a289d45c0 grep: fix worktree case in submodules 870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching 8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data 09872f6418 grep: create a "is_fixed" member in "grep_pat" 8a35b540a9 grep: consistently use "p->fixed" in compile_regexp() 685668faaa grep: stop using a custom JIT stack with PCRE v1 34489239d0 grep: stop "using" a custom JIT stack with PCRE v2 04bef50c01 grep: remove overly paranoid BUG(...) code b65abcafc7 grep: use PCRE v2 for optimized fixed-string search 48de2a768c grep: remove the kwset optimization 45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern> 25754125ce grep: make the behavior for NUL-byte in patterns sane d316af059d grep tests: move binary pattern tests into their own file 471dac5d2c grep tests: move "grep binary" alongside the rest f463beb805 grep: inline the return value of a function call used only once b14cf112e2 t4210: skip more command-line encoding tests on MinGW 44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>" 4e2443b181 log tests: test regex backends in "--encode=<enc>" tests 90d21f9ebf list-objects-filter-options: make parser void 5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW 489fc9ee71 list-objects-filter-options: allow mult. --filter c2694952e3 strbuf: give URL-encoding API a char predicate fn cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list f56f764279 list-objects-filter-options: move error check up e987df5fe6 list-objects-filter: implement composite filters 842b00516a list-objects-filter-options: always supply *errbuf 7a7c7f4a6d list-objects-filter: put omits set in filter struct 9430147ca0 list-objects-filter: encapsulate filter components 4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c 60b7a92d84 Move repository_format_partial_clone to promisor-remote.c db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} 75de085211 remote: add promisor and partial clone config to the doc 7e154badc0 partial-clone: add multiple remotes in the doc 9a4c507886 t0410: test fetching from many promisor remotes 5e46139376 builtin/fetch: remove unique promisor remote limitation fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote() faf2abf496 promisor-remote: use repository_format_partial_clone 9cfebc1f3b promisor-remote: add promisor_remote_reinit() 9e27beaa23 promisor-remote: implement promisor_remote_get_direct() 48de315817 Add initial support for many promisor remotes 2e860675b6 fetch-object: make functions return an error code c59c7c879e t0410: remove pipes after git commands git-subtree-dir: third_party/git git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "no es pot usar %s com a fitxer d'exclusió"
#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "no s'ha pogut obrir el directori «%s»"
#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli"
#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr ""
"la memòria cau no seguida està inhabilitada en aquest sistema o ubicació"
#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr "el fitxer d'índex al dipòsit %s és malmès"
#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "no s'han pogut crear directoris per %s"
#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
#: editor.c:73
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
#: entry.c:178
msgid "Filtering content"
msgstr "S'està filtrant el contingut"
#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
#: environment.c:332
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "no s'ha pogut establir GIT_DIR a «%s»"
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "hi ha massa arguments per a executar %s"
#: fetch-object.c:17
msgid "Remote with no URL"
msgstr "Remot sense URL"
#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: llista superficial esperada"
#: fetch-pack.c:154
#, fuzzy
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: llista superficial esperada"
#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»"
#: fetch-pack.c:196
msgid "unable to write to remote"
msgstr "no s'ha pogut escriure al remot"
#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requereix multi_ack_detailed"
#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "línia de shallow no vàlida: %s"
#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línia d'unshallow no vàlida: %s"
#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "objecte no trobat: %s"
#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "error en objecte: %s"
#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "no s'ha trobat cap shallow: %s"
#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "s'ha rebut %s %d %s"
#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "comissió no vàlida %s"
#: fetch-pack.c:465
msgid "giving up"
msgstr "s'abandona"
#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "fet"
#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "s'ha rebut %s (%d) %s"
#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "S'està marcant %s com a complet"
#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "ja es té %s (%s)"
#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "error de protocol: capçalera de paquet errònia"
#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no es pot bifurcar de %s"
#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "%s ha fallat"
#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "error en desmultiplexor de banda lateral"
#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "La versió del servidor és %.*s"
#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
#, c-format
msgid "Server supports %s"
msgstr "El servidor accepta %s"
#: fetch-pack.c:915
msgid "Server does not support shallow clients"
msgstr "El servidor no permet clients superficials"
#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "El servidor no admet --shallow-since"
#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no admet --shallow-exclude"
#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "El servidor no admet --deepen"
#: fetch-pack.c:1001
msgid "no common commits"
msgstr "cap comissió en comú"
#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: l'obtenció ha fallat."
#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "El servidor no permet peticions superficials"
#: fetch-pack.c:1157
msgid "Server supports filter"
msgstr "El servidor accepta filtratge"
#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr "no s'ha pogut escriure la petició al remot"
#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "error en llegir la capçalera de la secció «%s»"
#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "s'esperava «%s», s'ha rebut «%s»"
#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "línia de confirmació inesperada: «%s»"
#: fetch-pack.c:1252
#, fuzzy, c-format
msgid "error processing acks: %d"
msgstr "error en llegir %s"
#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "s'espera l'enviament del fitxer de paquet després de «ready»"
#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "s'espera que cap altra seccions s'enviï després de no «ready»"
#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "s'ha produït un error en processar la informació superficial: %d"
#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperat: «%s»"
#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "s'ha produït un error en processar les referències desitjades: %d"
#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "no hi ha cap HEAD remot coincident"
#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "no existeix la referència remota %s"
#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg ha fallat en signar les dades"
#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "no s'ha pogut crear el fitxer temporal"
#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
#: graph.c:97
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: no s'ha pogut llegir %s"
#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "s'ha produït un error en fer stat a «%s»"
#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "«%s»: lectura curta"
#: help.c:23
msgid "start a working area (see also: git help tutorial)"
msgstr "començar una àrea de treball (vegeu també: git help tutorial)"
#: help.c:24
msgid "work on the current change (see also: git help everyday)"
msgstr "treballar en el canvi actual (vegeu també: git help everyday)"
#: help.c:25
msgid "examine the history and state (see also: git help revisions)"
msgstr "examinar la història i l'estat (vegeu també: git help revisions)"
#: help.c:26
msgid "grow, mark and tweak your common history"
msgstr "fer créixer, marcar i ajustar la vostra història comuna"
#: help.c:27
msgid "collaborate (see also: git help workflows)"
msgstr "col·laborar (vegeu també: git help workflow)"
#: help.c:31
msgid "Main Porcelain Commands"
msgstr ""
#: help.c:32
msgid "Ancillary Commands / Manipulators"
msgstr ""
#: help.c:33
msgid "Ancillary Commands / Interrogators"
msgstr ""
#: help.c:34
msgid "Interacting with Others"
msgstr "Interaccionar amb altres"
#: help.c:35
msgid "Low-level Commands / Manipulators"
msgstr "Ordres de baix nivell / Manipuladors"
#: help.c:36
msgid "Low-level Commands / Interrogators"
msgstr "Ordres de baix nivell / Interrogadors"
#: help.c:37
msgid "Low-level Commands / Synching Repositories"
msgstr "Ordres de baix nivell / Sincronització de dipòsits"
#: help.c:38
msgid "Low-level Commands / Internal Helpers"
msgstr "Ordres de baix nivell / Ajudants interns"
#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "ordres de git disponibles en «%s»"
#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr ""
"Aquestes són ordres del Git habitualment usades en diverses situacions:"
#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "tipus de llistat de l'ordre no compatible «%s»"
#: help.c:403
msgid "The common Git guides are:"
msgstr "Les guies de Git comunes són:"
#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "Vegeu «git help <ordre>» per llegir sobre un subordre específic"
#: help.c:517
msgid "External commands"
msgstr "Ordres externes"
#: help.c:532
msgid "Command aliases"
msgstr "Àlies d'ordres"
#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
"«%s» sembla un ordre de git, però no hem pogut\n"
"executar-la. Pot ser que git-%s estigui malmès?"
#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"ADVERTÈNCIA: Heu invocat un ordre de Git amb nom «%s», la qual no existeix."
#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»."
#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: «%s» no és un ordre de git. Vegeu «git --help»."
#: help.c:699
msgid ""
"\n"
"The most similar command is"
msgid_plural ""
"\n"
"The most similar commands are"
msgstr[0] ""
"\n"
"L'ordre més similar és"
msgstr[1] ""
"\n"
"Les ordres més similars són"
#: help.c:714
msgid "git version [<options>]"
msgstr "git version [<opcions>]"
#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
#: help.c:786
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
"\n"
"Volíeu dir això?"
msgstr[1] ""
"\n"
"Volíeu dir un d'aquests?"
#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
"\n"
"Run\n"
"\n"
" git config --global user.email \"you@example.com\"\n"
" git config --global user.name \"Your Name\"\n"
"\n"
"to set your account's default identity.\n"
"Omit --global to set the identity only in this repository.\n"
"\n"
msgstr ""
"\n"
"*** Digueu-me qui sou.\n"
"\n"
"Executeu\n"
"\n"
" git config --global user.email \"usuari@domini.com\"\n"
" git config --global user.name \"El vostre nom\"\n"
"\n"
"per a establir la identitat predeterminada del vostre compte.\n"
"Ometeu --global per a establir la identitat només en aquest dipòsit.\n"
#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr ""
"no s'ha proporcionat cap adreça electrònica i la detecció automàtica està "
"inhabilitada"
#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
"no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha "
"rebut «%s»)"
#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr ""
"no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "no s'ha pogut detectar automàticament el nom (s'ha rebut «%s»)"
#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "nom d'identitat buit (per <%s>) no és permès"
#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "el nom conté només caràcters no permesos: %s"
#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
#: list-objects.c:129
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre"
#: list-objects.c:142
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "l'entrada «%s» a l'arbre %s té mode blob, però no és un blob"
#: list-objects.c:378
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "no s'ha pogut carregar l'arrel de l'arbre per la comissió %s"
#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "no es poden combinar múltiples especificacions de filtratge"
#: list-objects-filter-options.c:58
msgid "expected 'tree:<depth>'"
msgstr "s'esperava «tree:<profunditat>»"
#: list-objects-filter-options.c:84
msgid "sparse:path filters support has been dropped"
msgstr ""
#: list-objects-filter-options.c:94
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "filtre d'especificació no vàlid: «%s»"
#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr ""
#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"\n"
"Another git process seems to be running in this repository, e.g.\n"
"an editor opened by 'git commit'. Please make sure all processes\n"
"are terminated then try again. If it still fails, a git process\n"
"may have crashed in this repository earlier:\n"
"remove the file manually to continue."
msgstr ""
"No s'ha pogut crear '%s.lock': %s.\n"
"\n"
"Sembla que un altre procés de git s'està executant en aquest\n"
"dipòsit, per exemple, un editor obert per «git commit». \n"
"Assegureu-vos que tots els processos s'hagin acabat i\n"
"llavors proveu de nou. Si encara falla, pot ser que un procés de\n"
"git ha tingut un error:\n"
"elimineu el fitxer manualment per a continuar."
#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "No s'ha pogut crear «%s.lock»: %s"
#: merge.c:41
msgid "failed to read the cache"
msgstr "s'ha produït un error en llegir la memòria cau"
#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(comissió errònia)\n"
#: merge-recursive.c:345
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "addinfo_cache ha fallat per al camí «%s»; interrompent la fusió."
#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "addinfo_cache ha fallat al refrescar el camí «%s»; interrompent la fusió."
#: merge-recursive.c:437
msgid "error building trees"
msgstr "error en construir arbres"
#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "s'ha produït un error en crear el camí «%s»%s"
#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s «%s»"
#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob esperat per a %s «%s»"
#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "s'ha produït un error en obrir «%s»: %s"
#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no se sap què fer amb %06o %s «%s»"
#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)"
#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"S'ha produït un error en fusionar el submòdul %s (les comissions no "
"segueixen merge-base)"
#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Avançament ràpid del submòdul %s a la següent comissió:"
#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avançament ràpid al submòdul %s"
#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
"S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)"
#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n"
#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"by using:\n"
"\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n"
"\n"
"which will accept this suggestion.\n"
msgstr ""
#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
"S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples "
"fusions)"
#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "S'ha produït un error en executar la fusió interna"
#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "No s'ha pogut afegir %s a la base de dades"
#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha escrit a %s."
#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre."
#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre."
#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre a %s."
#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre a %s."
#: merge-recursive.c:1511
msgid "rename"
msgstr "canvi de nom"
#: merge-recursive.c:1511
msgid "renamed"
msgstr "canviat de nom"
#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "S'està refusant a perdre el fitxer brut a %s"
#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig de l'operació."
#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha afegit %s a "
"%s"
#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això"
#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"s'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint "
"com a %s"
#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la "
"branca «%s» canvi de nom «%s»->«%s» en «%s»%s"
#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
"nom %s->%s en %s"
#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"directory %s was renamed to multiple other directories, with no destination "
"getting a majority of the files."
msgstr ""
#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
#: merge-recursive.c:2169
#, fuzzy, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
"nom %s->%s en %s"
#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell mateix ja havia canviat de nom."
#: merge-recursive.c:2937
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
#: merge-recursive.c:2940
#, c-format
msgid "object %s is not a blob"
msgstr "l'objecte %s no és un blob"
#: merge-recursive.c:3004
msgid "modify"
msgstr "modificació"
#: merge-recursive.c:3004
msgid "modified"
msgstr "modificat"
#: merge-recursive.c:3016
msgid "content"
msgstr "contingut"
#: merge-recursive.c:3020
msgid "add/add"
msgstr "afegiment/afegiment"
#: merge-recursive.c:3043
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "S'ha omès %s (el fusionat és igual a l'existent)"
#: merge-recursive.c:3065 git-submodule.sh:937
msgid "submodule"
msgstr "submòdul"
#: merge-recursive.c:3066
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
#: merge-recursive.c:3096
#, c-format
msgid "Adding as %s instead"
msgstr "S'està afegint com a %s en lloc d'això"
#: merge-recursive.c:3178
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
#: merge-recursive.c:3181
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
#: merge-recursive.c:3185
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
#: merge-recursive.c:3188
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
#: merge-recursive.c:3302
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant %s"
#: merge-recursive.c:3325
msgid "file/directory"
msgstr "fitxer/directori"
#: merge-recursive.c:3330
msgid "directory/file"
msgstr "directori/fitxer"
#: merge-recursive.c:3337
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
"%s"
#: merge-recursive.c:3346
#, c-format
msgid "Adding %s"
msgstr "S'està afegint %s"
#: merge-recursive.c:3355
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
#: merge-recursive.c:3393
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
" %s"
#: merge-recursive.c:3404
msgid "Already up to date!"
msgstr "Ja està al dia!"
#: merge-recursive.c:3413
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
#: merge-recursive.c:3512
msgid "Merging:"
msgstr "S'està fusionant:"
#: merge-recursive.c:3525
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "s'ha trobat %u avantpassat en comú:"
msgstr[1] "s'han trobat %u avantpassats en comú:"
#: merge-recursive.c:3564
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
#: merge-recursive.c:3630
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte «%s»"
#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
#: midx.c:95
#, fuzzy, c-format
msgid "hash version %u does not match"
msgstr "el camí «%s» no té la seva versió"
#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr ""
#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr ""
#: midx.c:470
#, fuzzy, c-format
msgid "failed to add packfile '%s'"
msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
#: midx.c:476
#, fuzzy, c-format
msgid "failed to open pack-index '%s'"
msgstr "s'ha produït un error en obrir «%s»"
#: midx.c:536
#, fuzzy, c-format
msgid "failed to locate object %d in packfile"
msgstr "s'ha produït un error en llegir l'objecte «%s»."
#: midx.c:865
#, c-format
msgid "did not see pack-file %s to drop"
msgstr ""
#: midx.c:1036
#, fuzzy, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "s'ha produït un error en netejar l'índex"
#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr "S'estan cercant fitxers de paquets referenciats"
#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr ""
#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr "S'estan ordenant els objectes per fitxer de paquet"
#: midx.c:1144
msgid "Verifying object offsets"
msgstr "S'estan verificant els desplaçaments dels objectes"
#: midx.c:1160
#, fuzzy, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "no s'ha pogut afegir una entrada de cau per a %s"
#: midx.c:1166
#, fuzzy, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
#: midx.c:1350
msgid "could not start pack-objects"
msgstr "no s'ha pogut executar el pack-objects"
#: midx.c:1369
msgid "could not finish pack-objects"
msgstr "no s'ha pogut finalitzar el pack-objects"
#: name-hash.c:532
#, fuzzy, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "no s'ha pogut crear fil: %s"
#: name-hash.c:554
#, fuzzy, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "no s'ha pogut crear fil: %s"
#: name-hash.c:560
#, fuzzy, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "no s'ha pogut crear fil: %s"
#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
"No heu acabat la vostra fusió de notes prèvia (%s existeix).\n"
"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/"
"avortar la fusió prèvia abans de començar una fusió de notes nova."
#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "No heu conclòs la vostra fusió de notes (%s existeix)."
#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Valor de notes.rewriteMode erroni: «%s»"
#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
#. TRANSLATORS: The first %s is the name of
#. the environment variable, the second %s is
#. its value.
#.
#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Valor erroni de %s: «%s»"
#: object.c:54
#, c-format
msgid "invalid object type \"%s\""
msgstr "tipus d'objecte «%s» no vàlid"
#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "l'objecte %s és %s, no pas %s"
#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr "l'objecte %s té un identificador de tipus %d desconegut"
#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
#: object.c:267 object.c:278
#, c-format
msgid "hash mismatch %s"
msgstr ""
#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)"
#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)"
#: parse-options.c:38
#, c-format
msgid "%s requires a value"
msgstr "%s requereix un valor"
#: parse-options.c:73
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s és incompatible amb %s"
#: parse-options.c:78
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: és incompatible amb alguna altra cosa"
#: parse-options.c:92 parse-options.c:96 parse-options.c:319
#, c-format
msgid "%s takes no value"
msgstr "%s no accepta cap valor"
#: parse-options.c:94
#, c-format
msgid "%s isn't available"
msgstr "%s no és disponible"
#: parse-options.c:219
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
#: parse-options.c:389
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
#: parse-options.c:423 parse-options.c:431
#, c-format
msgid "did you mean `--%s` (with two dashes ?)"
msgstr ""
#: parse-options.c:859
#, c-format
msgid "unknown option `%s'"
msgstr "opció desconeguda «%s»"
#: parse-options.c:861
#, c-format
msgid "unknown switch `%c'"
msgstr "«switch» «%c» desconegut"
#: parse-options.c:863
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "opció no ascii desconeguda en la cadena: «%s»"
#: parse-options.c:887
msgid "..."
msgstr "..."
#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " o: %s"
#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
#: parse-options.c:954
msgid "-NUM"
msgstr "-NUM"
#: parse-options.c:968
#, c-format
msgid "alias of --%s"
msgstr "àlies de --%s"
#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "l'opció «%s» espera un valor numèric"
#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "data de venciment «%s» mal formada"
#: parse-options-cb.c:54
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "l'opció «%s» espera «always», «auto» o «never»"
#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "nom d'objecte «%s» mal format"
#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "No s'ha pogut fer %s escrivible pel grup"
#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"El caràcter d'escapament «\\» no està permès com a últim caràcter en un "
"valor d'un atribut"
#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
msgstr "Només es permet una especificació «attr:»."
#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "una especificació d'atribut no pot estar buida"
#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "nom d'atribut no vàlid %s"
#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"els paràmetres d'especificació de camí «glob» i «noglob» globals són "
"incompatibles"
#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
"el paràmetre d'especificació de camí «literal» global és incompatible amb "
"tots els altres paràmetres d'especificació de camí globals"
#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "paràmetre no vàlid per a la màgia d'especificació de camí «prefix»"
#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Màgia d'especificació de camí no vàlida '%.*s' en «%s»"
#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "«)» mancant al final de la màgia d'especificació de camí en «%s»"
#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Màgia d'especificació de camí no implementada «%c» en «%s»"
#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: «literal» i «glob» són incompatibles"
#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: «%s» és fora del dipòsit"
#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "«%s» (mnemònic: «%c»)"
#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic"
#: pkt-line.c:92
msgid "unable to write flush packet"
msgstr "no s'ha pogut escriure el paquet de buidatge"
#: pkt-line.c:99
msgid "unable to write delim packet"
msgstr "no s'ha pogut escriure el paquet delim"
#: pkt-line.c:106
msgid "flush packet write failed"
msgstr "s'ha produït un error en escriure el paquet de buidatge"
#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr "error de protocol: longitud de línia impossible"
#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr "ha fallat l'escriptura del paquet amb format"
#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"no s'ha pogut escriure el paquet - les dades excedeixen la mida màxima del "
"paquet"
#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr "no s'ha pogut escriure el paquet"
#: pkt-line.c:295
msgid "read error"
msgstr "error de lectura"
#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr "el remot ha penjat inesperadament"
#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr "error de protocol: longitud de línia errònia %d"
#: pkt-line.c:362
#, c-format
msgid "remote error: %s"
msgstr "error remot: %s"
#: preload-index.c:119
msgid "Refreshing index"
msgstr "S'està actualitzant l'índex"
#: preload-index.c:138
#, fuzzy, c-format
msgid "unable to create threaded lstat: %s"
msgstr "no s'ha pogut crear fil: %s"
#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
#: range-diff.c:70
msgid "could not start `log`"
msgstr "no s'ha pogut iniciar «log»"
#: range-diff.c:72
msgid "could not read `log` output"
msgstr "no s'ha pogut llegir la sortida de «log»"
#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "no s'ha pogut analitzar la comissió «%s»"
#: range-diff.c:117
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "no s'ha pogut llegir la capçalera de la gif «%.*s»"
#: range-diff.c:274
msgid "failed to generate diff"
msgstr "s'ha produït un error en generar el diff"
#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre per «%s»"
#: read-cache.c:680
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "no s'afegirà l'àlies «%s»: («%s» ja existeix en l'índex)"
#: read-cache.c:696
msgid "cannot create an empty blob in the object database"
msgstr "no es pot crear un blob buit a la base de dades d'objectes"
#: read-cache.c:718
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr "%s: només pot afegir fitxers normals, enllaços simbolics o directoris git"
#: read-cache.c:723
#, fuzzy, c-format
msgid "'%s' does not have a commit checked out"
msgstr "«%s» no assenyala una comissió"
#: read-cache.c:775
#, c-format
msgid "unable to index file '%s'"
msgstr "no es pot llegir indexar el fitxer «%s»"
#: read-cache.c:794
#, c-format
msgid "unable to add '%s' to index"
msgstr "no s'ha pogut afegir «%s» a l'índex"
#: read-cache.c:805
#, fuzzy, c-format
msgid "unable to stat '%s'"
msgstr "no s'ha pogut actualitzar %s"
#: read-cache.c:1314
#, fuzzy, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "%s existeix i no és directori"
#: read-cache.c:1499
msgid "Refresh index"
msgstr "Actualitza l'índex"
#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"index.version està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
#: read-cache.c:1679
#, c-format
msgid "bad signature 0x%08x"
msgstr "signatura malmesa 0x%08x"
#: read-cache.c:1682
#, c-format
msgid "bad index version %d"
msgstr "versió d'índex incorrecta %d"
#: read-cache.c:1691
msgid "bad index file sha1 signature"
msgstr "signatura sha1 malmesa al fitxer d'índex"
#: read-cache.c:1721
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "l'índex usa l'extensió %.4s, que no es pot entendre"
#: read-cache.c:1723
#, c-format
msgid "ignoring %.4s extension"
msgstr "s'està ignorant l'extensió %.4s"
#: read-cache.c:1760
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "Format d'entrada d'índex desconeguda «0x%08x»"
#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "camp del nom mal formatat l'index, camí a prop «%s»"
#: read-cache.c:1833
msgid "unordered stage entries in index"
msgstr ""
#: read-cache.c:1836
#, fuzzy, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "nom d'identitat buit (per <%s>) no és permès"
#: read-cache.c:1839
#, fuzzy, c-format
msgid "unordered stage entries for '%s'"
msgstr "no s'han pogut crear directoris per %s"
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
#: read-cache.c:2087
#, fuzzy, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "no s'ha pogut crear fil: %s"
#: read-cache.c:2100
#, fuzzy, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "no s'ha pogut crear fil: %s"
#: read-cache.c:2133
#, fuzzy, c-format
msgid "%s: index file open failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
#: read-cache.c:2137
#, fuzzy, c-format
msgid "%s: cannot stat the open index"
msgstr "no es pot llegir l'índex"
#: read-cache.c:2141
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: fitxer d'índex més petit que s'esperava"
#: read-cache.c:2145
#, c-format
msgid "%s: unable to map index file"
msgstr "%s: no es pot mapar el fitxer d'índex"
#: read-cache.c:2187
#, fuzzy, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "no s'ha pogut crear fil: %s"
#: read-cache.c:2214
#, fuzzy, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "no s'ha pogut crear fil: %s"
#: read-cache.c:2246
#, fuzzy, c-format
msgid "could not freshen shared index '%s'"
msgstr "no s'ha pogut llegir el fitxer «%s»"
#: read-cache.c:2293
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "índex malmès, s'esperava %s a %s, s'ha rebut %s"
#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "no s'ha pogut tancar «%s»"
#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "no s'ha pogut fer stat a «%s»"
#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "no s'ha pogut obrir el directori git: %s"
#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "no s'ha pogut desenllaçar: %s"
#: read-cache.c:3142
#, fuzzy, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "no s'ha pogut resoldre la revisió: %s"
#: read-cache.c:3291
#, fuzzy, c-format
msgid "%s: cannot drop to stage #0"
msgstr "no es pot canviar de directori a %s"
#: rebase-interactive.c:26
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
"No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està "
"ignorant."
#: rebase-interactive.c:35
#, fuzzy
msgid ""
"\n"
"Commands:\n"
"p, pick <commit> = use commit\n"
"r, reword <commit> = use commit, but edit the commit message\n"
"e, edit <commit> = use commit, but stop for amending\n"
"s, squash <commit> = use commit, but meld into previous commit\n"
"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
"x, exec <command> = run command (the rest of the line) using shell\n"
"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
"d, drop <commit> = remove commit\n"
"l, label <label> = label current HEAD with a name\n"
"t, reset <label> = reset HEAD to a label\n"
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". create a merge commit using the original merge commit's\n"
". message (or the oneline, if no original merge commit was\n"
". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"Ordres:\n"
" p, pick = usa la comissió\n"
" r, reword = usa la comissió, però edita el missatge de comissió\n"
" e, edit = usa la comissió, però atura't per a esmenar\n"
" s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n"
" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta "
"comissió\n"
" x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret "
"d'ordres\n"
" d, drop = elimina la comissió\n"
"\n"
"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
#: rebase-interactive.c:56
#, fuzzy, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
"\n"
"No elimineu cap línia. Useu «drop» explícitament per a eliminar una "
"comissió.\n"
#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
"\n"
"Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
"To continue rebase after editing, run:\n"
" git rebase --continue\n"
"\n"
msgstr ""
"\n"
"Esteu editant el fitxer de coses a fer d'un «rebase» interactiu en marxa.\n"
"Per a continuar el «rebase» després d'editar, executeu:\n"
" git rebase --continue\n"
"\n"
#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
"\n"
"No obstant, si elimineu tot, s'avortarà el «rebase».\n"
"\n"
#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Tingueu en compte que les comissions buides estan comentades"
#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "no s'ha pogut escriure «%s»"
#: rebase-interactive.c:108
#, c-format
msgid "could not copy '%s' to '%s'."
msgstr "no s'ha pogut copiar «%s» a «%s»."
#: rebase-interactive.c:173
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
"Advertència: pot ser que algunes comissions s'hagin descartat "
"accidentalment.\n"
"Les comissions descartades (més nova a més vella):\n"
#: rebase-interactive.c:180
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
"Use 'git config rebase.missingCommitsCheck' to change the level of "
"warnings.\n"
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una "
"comissió.\n"
"\n"
"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell "
"d'advertències.\n"
"Els comportaments possibles són: ignore, warn, error.\n"
#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s no apunta a un objecte vàlid"
#: refs.c:667
#, fuzzy, c-format
msgid "ignoring dangling symref %s"
msgstr "s'està ignorant la referència trencada %s"
#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "s'està ignorant la referència trencada %s"
#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "no s'ha pogut obrir «%s» per a escriptura: %s"
#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "no s'ha pogut llegir la referència «%s»"
#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "la referència «%s» ja existeix"
#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "ID d'objecte no esperat en escriure «%s»"
#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "no s'ha pogut obrir «%s» per a escriptura"
#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "ID d'objecte no esperat en suprimir «%s»"
#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr ""
#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "s'està refusant la referència amb nom malmès «%s»"
#: refs.c:1231
#, fuzzy, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "s'ha produït un error en obrir «%s»: %s"
#: refs.c:2012
#, fuzzy, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "nom d'identitat buit (per <%s>) no és permès"
#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "no està permès actualitzar les referències en un entorn de quarantena"
#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "«%s» existeix; no es pot crear «%s»"
#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "no es poden processar «%s» i «%s» a la vegada"
#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "no s'ha pogut eliminar la referència %s"
#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "no s'han pogut suprimir les referències: %s"
#: refspec.c:137
#, fuzzy, c-format
msgid "invalid refspec '%s'"
msgstr "fitxer no vàlid: «%s»"
#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "no hi és"
#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "davant per %d"
#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "darrere per %d"
#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "davant per %d, darrere per %d"
#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format esperat: %%(color:<color>)"
#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconegut: %%(color:%s)"
#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "valor enter esperat pel nom de referència:lstrip=%s"
#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "valor enter esperat pel nom de referència:rstrip=%s"
#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "paràmetre %%(%s) desconegut: %s"
#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(subject) no accepta paràmetres"
#: ref-filter.c:269
#, fuzzy, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "paràmetre %%(objectname) no reconegut: %s"
#: ref-filter.c:277
#, fuzzy, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(objectsize) no accepta paràmetres"
#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no accepta paràmetres"
#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) no accepta paràmetres"
#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "paràmetre %%(trailers) desconegut: %s"
#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positiu esperat conté:lines=%s"
#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "paràmetre %%(contents) no reconegut: %s"
#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valor positiu esperat nom d'objecte:curt=%s"
#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "paràmetre %%(objectname) no reconegut: %s"
#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format esperat: %%(align:<amplada>,<posició>)"
#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "posició no reconeguda:%s"
#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "amplada no reconeguda:%s"
#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "paràmetre %%(align) no reconegut: %s"
#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "amplada positiva esperada amb l'àtom %%(align)"
#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "paràmetre %%(if) no reconegut: %s"
#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de camp mal format: %.*s"
#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de camp desconegut: %.*s"
#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)"
#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)"
#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: s'ha usat l'àtom %%(then) més d'un cop"
#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(if)"
#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(then)"
#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: s'ha usat l'àtom %%(else) més d'un cop"
#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "cadena de format mal format %s"
#: ref-filter.c:1485
#, fuzzy, c-format
msgid "no branch, rebasing %s"
msgstr "(cap branca, s'està fent «rebase» %s)"
#: ref-filter.c:1488
#, fuzzy, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "(cap branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat)"
#: ref-filter.c:1491
#, c-format
msgid "no branch, bisect started on %s"
msgstr "(cap branca, bisecció començada en %s)"
#: ref-filter.c:1501
msgid "no branch"
msgstr "sense branca"
#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "manca l'objecte %s per a %s"
#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer ha fallat en %s per a %s"
#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "objecte mal format a «%s»"
#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: manca l'àtom %%(end)"
#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "l'opció «%s» és incompatible amb --merged"
#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "l'opció «%s» és incompatible amb --no-merged"
#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'opció «%s» ha d'apuntar a una comissió"
#: remote.c:363
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
#: remote.c:410
msgid "more than one receivepack given, using the first"
msgstr ""
#: remote.c:418
msgid "more than one uploadpack given, using the first"
msgstr ""
#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No es poden obtenir ambdós %s i %s a %s"
#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s generalment segueix %s, no %s"
#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segueix ambdós %s i %s"
#: remote.c:684
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr ""
#: remote.c:694
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr ""
#: remote.c:1000
#, fuzzy, c-format
msgid "src refspec %s does not match any"
msgstr "%s: no coincideix amb l'índex"
#: remote.c:1005
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
#: remote.c:1020
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"starting with \"refs/\"). We tried to guess what you meant by:\n"
"\n"
"- Looking for a ref that matches '%s' on the remote side.\n"
"- Checking if the <src> being pushed ('%s')\n"
" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
" refs/{heads,tags}/ prefix on the remote side.\n"
"\n"
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
#: remote.c:1040
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"Did you mean to create a new branch by pushing to\n"
"'%s:refs/heads/%s'?"
msgstr ""
#: remote.c:1045
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"Did you mean to create a new tag by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
#: remote.c:1050
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"Did you mean to tag a new tree by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
#: remote.c:1055
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"Did you mean to tag a new blob by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
#: remote.c:1091
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "«%s» no es pot resoldre a una branca"
#: remote.c:1102
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "no s'ha pogut suprimir «%s»: la referència remota no existeix"
#: remote.c:1114
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
#: remote.c:1121
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "HEAD no assenyala cap branca"
#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr "no existeix la branca: «%s»"
#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "cap font configurada per a la branca «%s»"
#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot"
#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branca «%s» no té cap remot al qual pujar"
#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les especificacions de referència de «%s» no inclouen «%s»"
#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr "push no té destí (push.default és «nothing)"
#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
#: remote.c:1840
#, c-format
msgid "couldn't find remote ref %s"
msgstr "no s'ha pogut trobar la referència remota %s"
#: remote.c:1853
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n"
#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "La vostra branca està al dia amb «%s».\n"
#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n"
#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "La vostra branca està %2$d comissió per davant de «%1$s».\n"
msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n"
#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n"
#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] ""
"La vostra branca està %2$d comissió per darrere de «%1$s», i pot avançar-se "
"ràpidament.\n"
msgstr[1] ""
"La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-"
"se ràpidament.\n"
#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (useu «git pull» per a actualitzar la vostra branca local)\n"
#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commit each, respectively.\n"
msgid_plural ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
"La vostra branca i «%s» han divergit,\n"
"i tenen %d i %d comissió distinta cada una, respectivament.\n"
msgstr[1] ""
"La vostra branca i «%s» han divergit,\n"
"i tenen %d i %d comissions distintes cada una, respectivament.\n"
#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (useu «git pull» per a fusionar la branca remota a la vostra)\n"
#: remote.c:2247
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "no es pot analitzar el nom de l'objecte esperat «%s»"
#: replace-object.c:21
#, fuzzy, c-format
msgid "bad replace ref name: %s"
msgstr "suprimeix les referències reemplaçades"
#: replace-object.c:30
#, fuzzy, c-format
msgid "duplicate replace ref: %s"
msgstr "suprimeix les referències reemplaçades"
#: replace-object.c:73
#, fuzzy, c-format
msgid "replace depth too high for object %s"
msgstr "reemplaça l'etiqueta si existeix"
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr ""
#: rerere.c:264 rerere.c:269
#, fuzzy
msgid "unable to write rerere record"
msgstr "no s'ha pogut escriure l'objecte de nota"
#: rerere.c:495
#, fuzzy, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "error en llegir %s"
#: rerere.c:498
#, fuzzy, c-format
msgid "failed to flush '%s'"
msgstr "s'ha produït un error en fer stat a «%s»"
#: rerere.c:503 rerere.c:1039
#, fuzzy, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "no s'ha pogut analitzar la comissió «%s»"
#: rerere.c:684
#, fuzzy, c-format
msgid "failed utime() on '%s'"
msgstr "s'ha produït un error en obrir «%s»"
#: rerere.c:694
#, fuzzy, c-format
msgid "writing '%s' failed"
msgstr "la creació de «%s» ha fallat"
#: rerere.c:714
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr ""
#: rerere.c:753
#, c-format
msgid "Recorded resolution for '%s'."
msgstr ""
#: rerere.c:788
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr ""
#: rerere.c:803
#, fuzzy, c-format
msgid "cannot unlink stray '%s'"
msgstr "no es pot fer symlink en «%s» «%s»"
#: rerere.c:807
#, fuzzy, c-format
msgid "Recorded preimage for '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "no s'ha pogut crear el directori «%s»"
#: rerere.c:1057
#, fuzzy, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "no s'ha pogut escriure a «%s»"
#: rerere.c:1068 rerere.c:1075
#, fuzzy, c-format
msgid "no remembered resolution for '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
#: rerere.c:1077
#, fuzzy, c-format
msgid "cannot unlink '%s'"
msgstr "no es pot fer readlink en «%s»"
#: rerere.c:1087
#, fuzzy, c-format
msgid "Updated preimage for '%s'"
msgstr "suprimeix les referències reemplaçades"
#: rerere.c:1096
#, fuzzy, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
#: rerere.c:1199
#, fuzzy
msgid "unable to open rr-cache directory"
msgstr "no s'ha pogut actualitzar l'arbre cau"
#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla malmesa"
#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la branca actual «%s» encara no té cap comissió"
#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
#: run-command.c:763
msgid "open /dev/null failed"
msgstr "s'ha produït un error en obrir /dev/null"
#: run-command.c:1269
#, fuzzy, c-format
msgid "cannot create async thread: %s"
msgstr "no s'ha pogut crear fil: %s"
#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"paquet de neteja no esperat quan estava llegint l'estat del desempaquetament "
"remot"
#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s"
#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "s'ha produït un error en el desempaquetament remot: %s"
#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "s'ha produït un error en signar el certificat de pujada"
#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr "el destí receptor no admet pujar --signed"
#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
"no s'està enviant una certificació de pujada perquè el destí receptor no "
"admet pujar --signed"
#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "el destí receptor no admet pujar --atomic"
#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "el destí receptor no admet opcions de pujada"
#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
#: sequencer.c:292
#, fuzzy, c-format
msgid "could not delete '%s'"
msgstr "No s'ha pogut suprimir %s"
#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "no s'ha pogut suprimir «%s»"
#: sequencer.c:321
msgid "revert"
msgstr "revertir"
#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
#: sequencer.c:327
#, fuzzy, c-format
msgid "unknown action: %d"
msgstr "Acció desconeguda: %d"
#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
"després de resoldre els conflictes, marqueu els camins\n"
"corregits amb 'git add <camins>' o 'git rm <camins>'"
#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
"després de resoldre els conflictes, marqueu els camins\n"
"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
"i cometeu el resultat amb 'git commit'"
#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "no s'ha pogut bloquejar «%s»"
#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "s'ha produït un error en finalitzar «%s»"
#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "no s'ha pogut llegir «%s»"
#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "els vostres canvis locals se sobreescriurien per %s."
#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanç ràpid"
#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "no s'ha pogut actualitzar l'arbre cau"
#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "no s'ha pogut resoldre la comissió HEAD"
#: sequencer.c:743
#, fuzzy, c-format
msgid "no key present in '%.*s'"
msgstr "no s'ha pogut analitzar «%.*s»"
#: sequencer.c:754
#, fuzzy, c-format
msgid "unable to dequote value of '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir «%s» per a lectura"
#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»"
#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»"
#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»"
#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "variable «%s» desconeguda"
#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta «GIT_AUTHOR_NAME»"
#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta «GIT_AUTHOR_EMAIL»"
#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta «GIT_AUTHOR_DATE»"
#: sequencer.c:884
#, fuzzy, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "format de data no vàlid: %s"
#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"If these changes are meant to be squashed into the previous commit, run:\n"
"\n"
" git commit --amend %s\n"
"\n"
"If they are meant to go into a new commit, run:\n"
"\n"
" git commit %s\n"
"\n"
"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
"teniu canvis «staged» en el vostre arbre de treball\n"
"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, "
"executeu:\n"
"\n"
" git commit --amend %s\n"
"\n"
"Si són per a formar una comissió nova, executeu:\n"
"\n"
" git commit %s\n"
"\n"
"En ambdós casos, quan hàgiu terminat, continueu amb:\n"
"\n"
" git rebase --continue\n"
#: sequencer.c:995
#, fuzzy
msgid "writing root commit"
msgstr "no hi ha res a cometre\n"
#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "el lligam «prepare-commit-msg» ha fallat"
#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly. Run the\n"
"following command and follow the instructions in your editor to edit\n"
"your configuration file:\n"
"\n"
" git config --global --edit\n"
"\n"
"After doing this, you may fix the identity used for this commit with:\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
"S'han configurat el vostre nom i adreça electrònica\n"
"automàticament basant-se en el vostre nom d'usuari i nom de màquina. \n"
"Comproveu que siguin correctes. Podeu suprimir aquest\n"
"missatge establint-los explícitament. Executeu l'ordre següent i\n"
"seguiu les instruccions en el vostre editor per editar el vostre\n"
"fitxer de configuració:\n"
"\n"
" git config --global --edit\n"
"Després de fer això, podeu esmenar la identitat usada per a aquesta\n"
"comissió amb:\n"
"\n"
" git commit --amend --reset-author\n"
#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly:\n"
"\n"
" git config --global user.name \"Your Name\"\n"
" git config --global user.email you@example.com\n"
"\n"
"After doing this, you may fix the identity used for this commit with:\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
"S'han configurat el vostre nom i adreça electrònica\n"
"automàticament basats en el vostre nom d'usuari i nom de màquina. \n"
"Comproveu que siguin correctes. Podeu suprimir aquest\n"
"missatge establint-los explícitament:\n"
"\n"
" git config --global user.name \"El Vostre Nom\"\n"
" git config --global user.email tu@example.com\n"
"\n"
"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
"comissió amb:\n"
"\n"
" git commit --amend --reset-author\n"
#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "no s'ha pogut resoldre HEAD després de crear la comissió"
#: sequencer.c:1328
msgid "detached HEAD"
msgstr "HEAD separat"
#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "no s'ha pogut analitzar HEAD"
#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s no és una comissió!"
#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "no s'ha pogut analitzar l'autor de la comissió"
#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»"
#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "no s'ha pogut analitzar la comissió pare %s"
#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "ordre desconeguda: %d"
#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Això és una combinació de %d comissions."
#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "cal un HEAD per reparar-ho"
#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "no s'ha pogut llegir HEAD"
#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "no es pot escriure «%s»"
#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1r missatge de comissió:"
#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Aquest és el missatge de comissió #%d:"
#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El missatge de comissió núm. #%d s'ometrà:"
#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "el vostre fitxer d'índex està sense fusionar."
#: sequencer.c:1805
#, fuzzy
msgid "cannot fixup root commit"
msgstr "no es pot trobar la comissió %s (%s)"
#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m."
#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "la comissió %s no té pare %d"
#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "no es pot obtenir el missatge de comissió de %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió pare %s"
#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "no s'ha pogut revertir %s... %s"
#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "no s'ha pogut aplicar %s... %s"
#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: s'ha produït un error en llegir l'índex"
#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: s'ha produït un error en actualitzar l'índex"
#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no accepta paràmetres: «%s»"
#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "falten els arguments per %s"
#: sequencer.c:2174
#, fuzzy, c-format
msgid "could not parse '%.*s'"
msgstr "no s'ha pogut analitzar «%s»"
#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línia no vàlida %d: %.*s"
#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "No es pot «%s» sense una comissió prèvia"
#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "no s'ha pogut llegir «%s»."
#: sequencer.c:2323
#, fuzzy
msgid "cancelling a cherry picking in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
#: sequencer.c:2330
#, fuzzy
msgid "cancelling a revert in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "corregiu-ho usant «git rebase --edit-todo»."
#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "full d'instruccions inusable: «%s»"
#: sequencer.c:2371
msgid "no commits parsed."
msgstr "no s'ha analitzat cap comissió."
#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "no es pot fer «cherry pick» durant una reversió."
#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "no es pot revertir durant un «cherry pick»."
#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr ""
#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "full d'opcions mal format: «%s»"
#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
#: sequencer.c:2668
#, fuzzy
msgid "revert is already in progress"
msgstr "un «cherry pick» o una reversió ja està en curs"
#: sequencer.c:2670
#, fuzzy, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
#: sequencer.c:2673
#, fuzzy
msgid "cherry-pick is already in progress"
msgstr "un «cherry pick» o una reversió ja està en curs"
#: sequencer.c:2675
#, fuzzy, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "no s'ha pogut bloquejar HEAD"
#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "no es pot avortar des d'una branca que encara ha de nàixer"
#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "no es pot obrir «%s»"
#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "no es pot llegir «%s»: %s"
#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès"
#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD"
#: sequencer.c:2859
#, fuzzy
msgid "no revert in progress"
msgstr "No hi ha un «rebase» en curs?"
#: sequencer.c:2867
#, fuzzy
msgid "no cherry-pick in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
#: sequencer.c:2877
#, fuzzy
msgid "failed to skip the commit"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
#: sequencer.c:2884
msgid "there is nothing to skip"
msgstr ""
#: sequencer.c:2887
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "no s'ha pogut actualitzar %s"
#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "No es pot llegir HEAD"
#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
#: sequencer.c:3074
#, fuzzy, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git commit --amend %s\n"
"\n"
"Once you are satisfied with your changes, run\n"
"\n"
" git rebase --continue\n"
msgstr ""
"Podeu esmenar la comissió ara, amb\n"
"\n"
"\tgit commit --amend $gpg_sign_opt_quoted\n"
"\n"
"Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
"\n"
"\tgit rebase --continue"
#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No s'ha pogut aplicar %s... %.*s"
#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "No s'ha pogut fusionar %.*s"
#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "no s'ha pogut llegir l'índex"
#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
"%sYou can fix the problem, and then run\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr ""
"ha fallat: %s\n"
"%sPodeu solucionar el problema, i llavors executar\n"
"\n"
" git rebase --continue\n"
"\n"
#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n"
#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
"but left changes to the index and/or the working tree\n"
"Commit or stash your changes, and then run\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr ""
"l'execució ha tingut èxit: %s\n"
"però ha deixat canvis a l'índex i/o l'arbre de treball\n"
"Cometeu o feu «stash» dels vostres canvis, i llavors executeu\n"
"\n"
" git rebase --continue\n"
#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom d'etiqueta no permès: «%.*s»"
#: sequencer.c:3263
#, fuzzy
msgid "writing fake root commit"
msgstr "no hi ha res a cometre\n"
#: sequencer.c:3268
msgid "writing squash-onto"
msgstr ""
#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, fuzzy, c-format
msgid "failed to find tree of %s"
msgstr "S'ha produït un error en cercar l'arbre de %s."
#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "no s'ha pogut escriure l'índex"
#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "no s'ha pogut resoldre «%s»"
#: sequencer.c:3379
#, fuzzy
msgid "cannot merge without a current revision"
msgstr "No es pot «%s» sense una comissió prèvia"
#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no s'ha pogut analitzar «%.*s»"
#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "no hi ha res per fusionar «%.*s»"
#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
#: sequencer.c:3437
#, fuzzy, c-format
msgid "could not get commit message of '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "no s'ha pogut fusionar «%.*s»"
#: sequencer.c:3606
#, fuzzy
msgid "merge: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "S'ha aplicat el «stash» automàticament.\n"
#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "no es pot emmagatzemar %s"
#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
"L'aplicació del «stash» automàtic ha resultat en conflictes.\n"
"Els vostres canvis estan segurs en el «stash».\n"
"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
#: sequencer.c:3751
#, fuzzy, c-format
msgid "could not checkout %s"
msgstr "no es pot agafar %s"
#: sequencer.c:3765
#, fuzzy, c-format
msgid "%s: not a valid OID"
msgstr "«%s» no és un terme vàlid"
#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "no s'ha pogut separar HEAD"
#: sequencer.c:3785
#, fuzzy, c-format
msgid "Stopped at HEAD\n"
msgstr "Aturat a %s... %.*s\n"
#: sequencer.c:3787
#, fuzzy, c-format
msgid "Stopped at %s\n"
msgstr "Aturat a %s... %.*s\n"
#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
"\n"
" %.*s\n"
"It has been rescheduled; To edit the command before continuing, please\n"
"edit the todo list first:\n"
"\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
msgstr ""
#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Aturat a %s... %.*s\n"
#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "ordre %d desconeguda"
#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "No s'ha pogut llegir orig-head"
#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "no s'ha pogut llegir 'onto'"
#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "no s'ha pogut actualitzar HEAD a %s"
#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "no es pot esmenar una comissió no existent"
#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "fitxer no vàlid: «%s»"
#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "contingut no vàlid: «%s»"
#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"\n"
"Teniu canvis no comesos en el vostre arbre de treball. \n"
"Primer cometeu-los i després executeu 'git rebase --continue' de nou."
#: sequencer.c:4167 sequencer.c:4205
#, fuzzy, c-format
msgid "could not write file: '%s'"
msgstr "no s'ha pogut crear el fitxer «%s»"
#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "No s'han pogut cometre els canvis «staged»."
#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot fer «cherry pick» a %s"
#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió incorrecta"
#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "no es pot revertir com a comissió inicial"
#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: opcions no gestionades"
#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: s'ha produït un error en preparar les revisions"
#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --"
"continue'.\n"
#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "res a fer"
#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "l'script ja estava endreçat."
#: setup.c:123
#, c-format
msgid "'%s' is outside repository"
msgstr "«%s» és fora del dipòsit"
#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
"%s: no hi ha tal camí en l'arbre de treball.\n"
"Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin "
"localment."
#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
"paràmetre ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de "
"treball.\n"
"Useu «--» per a separar els camins de les revisions:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "l'opció «%s» ha de venir abans dels arguments opcionals"
#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
"paràmetre ambigu «%s»: ambdós una revisió i un nom de fitxer\n"
"Useu '--' per a separar els camins de les revisions:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr ""
"no s'ha pogut configurar un arbre de treball utilitzant una configuració no "
"vàlida"
#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "aquesta operació s'ha d'executar en un arbre de treball"
#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d"
#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "s'han trobat extensions de dipòsit desconegudes:"
#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "s'ha produït un error en obrir «%s»"
#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "massa larg per a ser un fitxer .git: «%s»"
#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "error en llegir %s"
#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format gitfile no vàlid: %s"
#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "sense camí al gitfile: %s"
#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "no és un dipòsit de git: %s"
#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "«$%s» massa gran"
#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "no és un dipòsit de git: «%s»"
#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "no es pot canviar de directori a «%s»"
#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "no es pot tornar al directori de treball actual"
#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "s'ha produït un error en fer stat a «%*s%s%s»"
#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "No s'ha pogut llegir el directori de treball actual"
#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "no es pot canviar a «%s»"
#: setup.c:1103
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "no és un dipòsit de git (ni cap dels directoris pares): %s"
#: setup.c:1109
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
"no un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n"
"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"no està establert)."
#: setup.c:1220
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
"hi ha un problema amb el valor de mode de fitxer core.sharedRepository "
"(0%.3o).\n"
"El propietari dels fitxers sempre ha de tenir permisos de lectura i "
"escriptura."
#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "s'ha produït un error en obrir /dev/null o dup"
#: setup.c:1279
msgid "fork failed"
msgstr "el «fork» ha fallat"
#: setup.c:1284
msgid "setsid failed"
msgstr "l'«stash» ha fallat"
#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
#: sha1-file.c:504
#, fuzzy, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
#: sha1-file.c:583
#, fuzzy, c-format
msgid "unable to normalize object directory: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
#: sha1-file.c:626
#, fuzzy
msgid "unable to fdopen alternates lockfile"
msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
#: sha1-file.c:644
#, fuzzy
msgid "unable to read alternates file"
msgstr "no es pot llegir el fitxer d'índex"
#: sha1-file.c:651
#, fuzzy
msgid "unable to move new alternates file into place"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "el camí «%s» no existeix"
#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat."
#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "el dipòsit de referència «%s» no és un dipòsit local."
#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "el dipòsit de referència «%s» és superficial"
#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "el dipòsit de referència «%s» és empeltat"
#: sha1-file.c:792
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
#: sha1-file.c:943
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
#: sha1-file.c:968
msgid "mmap failed"
msgstr "mmap ha fallat"
#: sha1-file.c:1132
#, c-format
msgid "object file %s is empty"
msgstr "el tipus d'objecte %s és buit"
#: sha1-file.c:1256 sha1-file.c:2395
#, fuzzy, c-format
msgid "corrupt loose object '%s'"
msgstr "no s'ha pogut analitzar l'objecte «%s»"
#: sha1-file.c:1258 sha1-file.c:2399
#, fuzzy, c-format
msgid "garbage at end of loose object '%s'"
msgstr "no s'ha pogut analitzar l'objecte: %s"
#: sha1-file.c:1300
#, fuzzy
msgid "invalid object type"
msgstr "el tipus d'objecte és incorrecte."
#: sha1-file.c:1384
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
#: sha1-file.c:1387
#, fuzzy, c-format
msgid "unable to unpack %s header"
msgstr "no s'ha pogut actualitzar %s"
#: sha1-file.c:1393
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
#: sha1-file.c:1396
#, fuzzy, c-format
msgid "unable to parse %s header"
msgstr "no s'ha pogut actualitzar %s"
#: sha1-file.c:1587
#, fuzzy, c-format
msgid "failed to read object %s"
msgstr "s'ha produït un error en llegir l'objecte «%s»."
#: sha1-file.c:1591
#, fuzzy, c-format
msgid "replacement %s not found for %s"
msgstr "no s'han trobat les plantilles %s"
#: sha1-file.c:1595
#, fuzzy, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objecte local %s és malmès"
#: sha1-file.c:1599
#, fuzzy, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objecte local %s és malmès"
#: sha1-file.c:1702
#, fuzzy, c-format
msgid "unable to write file %s"
msgstr "no s'ha pogut escriure %s"
#: sha1-file.c:1709
#, fuzzy, c-format
msgid "unable to set permission to '%s'"
msgstr "no s'ha pogut resoldre la revisió: %s"
#: sha1-file.c:1716
#, fuzzy
msgid "file write error"
msgstr "escriptura fallada al rev-list"
#: sha1-file.c:1735
#, fuzzy
msgid "error when closing loose object file"
msgstr "error en tancar el fitxer de paquet"
#: sha1-file.c:1800
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
#: sha1-file.c:1802
#, fuzzy
msgid "unable to create temporary file"
msgstr "no s'ha pogut crear un índex temporal"
#: sha1-file.c:1826
#, fuzzy
msgid "unable to write loose object file"
msgstr "no s'ha pogut escriure l'objecte de nota"
#: sha1-file.c:1832
#, fuzzy, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
#: sha1-file.c:1836
#, fuzzy, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "ha fallat fstat a %s"
#: sha1-file.c:1840
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
#: sha1-file.c:1850 builtin/pack-objects.c:920
#, fuzzy, c-format
msgid "failed utime() on %s"
msgstr "s'ha produït un error en obrir «%s»"
#: sha1-file.c:1925
#, fuzzy, c-format
msgid "cannot read object for %s"
msgstr "no es pot llegir l'objecte %s"
#: sha1-file.c:1965
#, fuzzy
msgid "corrupt commit"
msgstr "autor corregit de la comissió"
#: sha1-file.c:1973
#, fuzzy
msgid "corrupt tag"
msgstr "informa de les etiquetes"
#: sha1-file.c:2072
#, fuzzy, c-format
msgid "read error while indexing %s"
msgstr "error en llegir %s"
#: sha1-file.c:2075
#, fuzzy, c-format
msgid "short read while indexing %s"
msgstr "no es pot llegir l'índex"
#: sha1-file.c:2148 sha1-file.c:2157
#, fuzzy, c-format
msgid "%s: failed to insert into database"
msgstr "gpg ha fallat en signar les dades"
#: sha1-file.c:2163
#, fuzzy, c-format
msgid "%s: unsupported file type"
msgstr "versió d'índex no compatible %s"
#: sha1-file.c:2187
#, fuzzy, c-format
msgid "%s is not a valid object"
msgstr "«%s» no és una terme vàlid"
#: sha1-file.c:2189
#, fuzzy, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no és un objecte de «%s» vàlid"
#: sha1-file.c:2216 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
#: sha1-file.c:2406 sha1-file.c:2458
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
#: sha1-file.c:2430
#, fuzzy, c-format
msgid "unable to mmap %s"
msgstr "no s'ha pogut obrir %s"
#: sha1-file.c:2435
#, fuzzy, c-format
msgid "unable to unpack header of %s"
msgstr "no s'ha pogut actualitzar %s"
#: sha1-file.c:2441
#, fuzzy, c-format
msgid "unable to parse header of %s"
msgstr "no s'ha pogut llegir %s"
#: sha1-file.c:2452
#, fuzzy, c-format
msgid "unable to unpack contents of %s"
msgstr "no s'ha pogut analitzar el contacte: %s"
#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "l'SHA1 %s curt és ambigu"
#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Els candidats són:"
#: sha1-name.c:800
#, fuzzy
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
"Git normalment mai crea una referència que acabi amb 40 caràcters\n"
"hexadecimals perquè s'ignorarà quan només especifiqueu 40 caràcters\n"
"hexadecimals. Aquestes referències es poden crear per error. Per\n"
"exemple,\n"
"\n"
" git checkout -b $br $(git rev-parse ...)\n"
"\n"
"on «$br» és d'alguna manera buida i una referència de 40 caràcters\n"
"hexadecimals. Examineu aquestes referències i potser\n"
"suprimiu-les. Desactiveu aquest missatge executant\n"
"«git config advice.objectNameWarning false»"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
#: strbuf.c:821
#, c-format
msgid "%u.%2.2u GiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
#: strbuf.c:823
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
#: strbuf.c:831
#, c-format
msgid "%u.%2.2u MiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
#: strbuf.c:833
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
#: strbuf.c:840
#, c-format
msgid "%u.%2.2u KiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
#: strbuf.c:842
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 byte
#: strbuf.c:848
#, fuzzy, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] "%u byte"
msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
#: strbuf.c:850
#, fuzzy, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "octets"
msgstr[1] "octets"
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes "
"de fusió"
#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s"
#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "l'allistament del .gitmodules actualitzat ha fallat"
#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "al submòdul sense popular «%s»"
#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "L'especificació «%s» és en el submòdul «%.*s»"
#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió"
#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida."
#: submodule.c:1481
#, fuzzy, c-format
msgid "Could not access submodule '%s'"
msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "«%s» no reconegut com un dipòsit git"
#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»"
#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
#: submodule.c:1817
#, fuzzy, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "el submòdul «%s» té l'índex brut"
#: submodule.c:1959
#, fuzzy, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submòduls canviats però no actualitzats:"
#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
"treball"
#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no s'ha trobat el nom pel submòdul «%s»"
#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' to\n"
"'%s'\n"
msgstr ""
"S'està migrant el directori de «%s%s» des de\n"
"«%s» a\n"
"«%s»\n"
#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "no s'ha pogut iniciar ls-files a .."
#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
#: submodule-config.c:232
#, fuzzy, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "no es permeten els valors negatius a submodule.fetchjobs"
#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "valor no vàlid per a %s"
#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "l'execució de l'ordre de remolc «%s» ha fallat"
#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "valor desconegut «%s» per a la clau «%s»"
#: trailer.c:539 trailer.c:544 builtin/remote.c:295
#, c-format
msgid "more than one %s"
msgstr "més d'un %s"
#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "testimoni de remolc buit en el remolc '%.*s'"
#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»"
#: trailer.c:753
msgid "could not read from stdin"
msgstr "no s'ha pogut llegir des de stdin"
#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "no s'ha pogut fer stat a %s"
#: trailer.c:1013
#, c-format
msgid "file %s is not a regular file"
msgstr "el fitxer %s no és un fitxer regular"
#: trailer.c:1015
#, c-format
msgid "file %s is not writable by user"
msgstr "el fitxer %s no és gravable per l'usuari"
#: trailer.c:1027
msgid "could not open temporary file"
msgstr "no s'ha pogut obrir el fitxer temporal"
#: trailer.c:1067
#, c-format
msgid "could not rename temporary file to %s"
msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
#: transport.c:142
#, fuzzy, c-format
msgid "could not read bundle '%s'"
msgstr "no s'ha pogut llegir el fitxer «%s»"
#: transport.c:208
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: opció de profunditat no vàlida «%s»"
#: transport.c:259
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
#: transport.c:260
msgid "server options require protocol version 2 or later"
msgstr ""
#: transport.c:625
#, fuzzy
msgid "could not parse transport.color.* config"
msgstr "no s'ha pogut analitzar l'script d'autor"
#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr ""
#: transport.c:825
#, fuzzy, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconegut «%s» per a la clau «%s»"
#: transport.c:891
#, fuzzy, c-format
msgid "transport '%s' not allowed"
msgstr "no s'ha trobat la branca «%s»."
#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr ""
#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
"Els camins de submòdul següents contenen canvis que no\n"
"es poden trobar en cap remot:\n"
#: transport.c:1044
#, c-format
msgid ""
"\n"
"Please try\n"
"\n"
"\tgit push --recurse-submodules=on-demand\n"
"\n"
"or cd to the path and use\n"
"\n"
"\tgit push\n"
"\n"
"to push them to a remote.\n"
"\n"
msgstr ""
"\n"
"Intenteu\n"
"\n"
"\tgit push --recurse-submodules=on-demand\n"
"\n"
"o canviar de directori al camí i useu\n"
"\n"
"\tgit push\n"
"\n"
"per a pujar-los a un remot.\n"
#: transport.c:1052
msgid "Aborting."
msgstr "S'està avortant."
#: transport.c:1193
#, fuzzy
msgid "failed to push all needed submodules"
msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
#: transport.c:1340 transport-helper.c:645
#, fuzzy
msgid "operation not supported by protocol"
msgstr "opció no admesa amb --recurse-submodules."
#: transport-helper.c:51 transport-helper.c:80
#, fuzzy
msgid "full write to remote helper failed"
msgstr "imprimeix l'estat des de l'ajudant remot"
#: transport-helper.c:134
#, fuzzy, c-format
msgid "unable to find remote helper for '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr ""
#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr ""
#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr ""
#: transport-helper.c:274 transport-helper.c:414
#, fuzzy, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "blob esperat per a %s «%s»"
#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "%s també ha bloquejat %s"
#: transport-helper.c:481
#, fuzzy
msgid "couldn't run fast-import"
msgstr "no s'ha pogut executar «stash»."
#: transport-helper.c:504
#, fuzzy
msgid "error while running fast-import"
msgstr "error en tancar el fitxer de paquet"
#: transport-helper.c:533 transport-helper.c:1105
#, fuzzy, c-format
msgid "could not read ref %s"
msgstr "No s'ha pogut llegir la referència %s"
#: transport-helper.c:578
#, fuzzy, c-format
msgid "unknown response to connect: %s"
msgstr "opció desconeguda: %s\n"
#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr ""
#: transport-helper.c:602
#, fuzzy
msgid "invalid remote service path"
msgstr "referència no vàlida: %s"
#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr ""
#: transport-helper.c:720
#, fuzzy, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "blob esperat per a %s «%s»"
#: transport-helper.c:773
#, fuzzy, c-format
msgid "helper reported unexpected status of %s"
msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
#: transport-helper.c:834
#, fuzzy, c-format
msgid "helper %s does not support dry-run"
msgstr "El servidor no admet --deepen"
#: transport-helper.c:837
#, fuzzy, c-format
msgid "helper %s does not support --signed"
msgstr "El servidor no admet --shallow-since"
#: transport-helper.c:840
#, fuzzy, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "el destí receptor no admet pujar --signed"
#: transport-helper.c:847
#, fuzzy, c-format
msgid "helper %s does not support 'push-option'"
msgstr "el destí receptor no admet opcions de pujada"
#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
#: transport-helper.c:950
#, fuzzy, c-format
msgid "helper %s does not support 'force'"
msgstr "El servidor no admet --deepen"
#: transport-helper.c:997
#, fuzzy
msgid "couldn't run fast-export"
msgstr "no s'ha pogut executar «stash»."
#: transport-helper.c:1002
#, fuzzy
msgid "error while running fast-export"
msgstr "error en tancar el fitxer de paquet"
#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
#: transport-helper.c:1091
#, fuzzy, c-format
msgid "malformed response in ref list: %s"
msgstr "full d'opcions mal format: «%s»"
#: transport-helper.c:1244
#, fuzzy, c-format
msgid "read(%s) failed"
msgstr "%s ha fallat"
#: transport-helper.c:1271
#, fuzzy, c-format
msgid "write(%s) failed"
msgstr "%s ha fallat"
#: transport-helper.c:1320
#, fuzzy, c-format
msgid "%s thread failed"
msgstr "%s ha fallat"
#: transport-helper.c:1324
#, fuzzy, c-format
msgid "%s thread failed to join: %s"
msgstr "s'ha produït un error en obrir «%s»"
#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr ""
#: transport-helper.c:1388
#, fuzzy, c-format
msgid "%s process failed"
msgstr "%s ha fallat"
#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr ""
#: tree-walk.c:33
msgid "too-short tree object"
msgstr "objecte d'arbre massa curt"
#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "mode mal format en entrada d'arbre"
#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "nom de fitxer buit en una entrada d'arbre"
#: tree-walk.c:118
msgid "too-short tree file"
msgstr "fitxer d'arbre massa curt"
#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per "
"agafar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per "
"agafar:\n"
"%%s"
#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per "
"fusionar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per "
"fusionar:\n"
"%%s"
#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%sPlease commit your changes or stash them before you %s."
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de %s."
#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%s"
#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
"En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
"%s"
#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
"agafar:\n"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
"agafar:\n"
"%%s"
#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
"fusionar:\n"
"%%sMoveu-los o elimineu-los abans de fusionar."
#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
"fusionar:\n"
"%%s"
#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%sMoveu-los o elimineu-los abans de %s."
#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%s"
#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
"agafar:\n"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%s"
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
"agafar:\n"
"%%s"
#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
"fusionar:\n"
"%%sMoveu-los o elimineu-los abans de fusionar."
#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
"fusionar:\n"
"%%s"
#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
"%s:\n"
"%%sMoveu-los o elimineu-los abans de %s."
#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
"%s:\n"
"%%s"
#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrada «%s» encavalca amb «%s». No es pot vincular."
#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"No es pot actualitzar l'agafament parcial: les entrades següents no estan al "
"dia:\n"
"%s"
#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"update:\n"
"%s"
msgstr ""
"Els fitxers següents en l'arbre de treball se sobreescriurien per "
"actualitzar l'agafament parcial:\n"
"%s"
#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"update:\n"
"%s"
msgstr ""
"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar "
"l'agafament parcial:\n"
"%s"
#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
"No es pot actualitzar el submòdul:\n"
"%s"
#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "S'està avortant\n"
#: unpack-trees.c:318
#, fuzzy
msgid "Updating files"
msgstr "S'està actualitzant %s"
#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"colliding group is in the working tree:\n"
msgstr ""
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'"
#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "seqüència d'escapament %XX no vàlida"
#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "manca la màquina i l'esquema no és 'file:'"
#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "un URL 'file:' no pot tenir número de port"
#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "hi ha caràcters no vàlids en el nom de màquina"
#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "número de port no vàlid"
#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "segment de camí '..' no vàlid"
#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "s'ha produït un error en llegir «%s»"
#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "«%s» no existeix"
#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "«%s» no és un fitxer .git, codi d'error %d"
#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "«%s» no assenyala de tornada a «%s»"
#: wrapper.c:223 wrapper.c:393
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura"
#: wrapper.c:424 wrapper.c:624
#, c-format
msgid "unable to access '%s'"
msgstr "no s'ha pogut accedir a «%s»"
#: wrapper.c:632
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Camins sense fusionar:"
#: wt-status.c:187 wt-status.c:219
#, fuzzy
msgid " (use \"git restore --staged <file>...\" to unstage)"
msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
#: wt-status.c:190 wt-status.c:222
#, fuzzy, c-format
msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)"
#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)"
#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
"resolució)"
#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Canvis a cometre:"
#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Canvis no «staged» per a cometre:"
#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
#: wt-status.c:241
#, fuzzy
msgid ""
" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
"directori de treball)"
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en el que es cometrà)"
#: wt-status.c:268
msgid "both deleted:"
msgstr "suprimit per ambdós:"
#: wt-status.c:270
msgid "added by us:"
msgstr "afegit per nosaltres:"
#: wt-status.c:272
msgid "deleted by them:"
msgstr "suprimit per ells:"
#: wt-status.c:274
msgid "added by them:"
msgstr "afegit per ells:"
#: wt-status.c:276
msgid "deleted by us:"
msgstr "suprimit per nosaltres:"
#: wt-status.c:278
msgid "both added:"
msgstr "afegit per ambdós:"
#: wt-status.c:280
msgid "both modified:"
msgstr "modificat per ambdós:"
#: wt-status.c:290
msgid "new file:"
msgstr "fitxer nou:"
#: wt-status.c:292
msgid "copied:"
msgstr "copiat:"
#: wt-status.c:294
msgid "deleted:"
msgstr "suprimit:"
#: wt-status.c:296
msgid "modified:"
msgstr "modificat:"
#: wt-status.c:298
msgid "renamed:"
msgstr "canviat de nom:"
#: wt-status.c:300
msgid "typechange:"
msgstr "canviat de tipus:"
#: wt-status.c:302
msgid "unknown:"
msgstr "desconegut:"
#: wt-status.c:304
msgid "unmerged:"
msgstr "sense fusionar:"
#: wt-status.c:384
msgid "new commits, "
msgstr "comissions noves, "
#: wt-status.c:386
msgid "modified content, "
msgstr "contingut modificat, "
#: wt-status.c:388
msgid "untracked content, "
msgstr "contingut no seguit, "
#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "L'«stash» té actualment %d entrada"
msgstr[1] "L'«stash» té actualment %d entrades"
#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Canvis de submòdul a cometre:"
#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
"No modifiqueu o suprimiu la línia de dalt.\n"
"Tot el que hi ha a sota s'ignorarà."
#: wt-status.c:1114
#, c-format
msgid ""
"\n"
"It took %.2f seconds to compute the branch ahead/behind values.\n"
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Teniu camins sense fusionar."
#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu \"git commit\")"
#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (useu \"git commit\" per a concloure la fusió)"
#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Esteu enmig d'una sessió am."
#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"
#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (useu \"git am --abort\" per a restaurar la branca original)"
#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "Manca git-rebase-todo."
#: wt-status.c:1311
msgid "No commands done."
msgstr "No s'ha fet cap ordre."
#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Última ordre feta (%d ordre feta):"
msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (vegeu més en el fitxer %s)"
#: wt-status.c:1330
msgid "No commands remaining."
msgstr "No manca cap ordre."
#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Ordre següent a fer (manca %d ordre):"
msgstr[1] "Ordres següents a fer (manquen %d ordres):"
#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)"
#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Actualment esteu fent «rebase»."
#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (arregleu els conflictes i després executeu \"git rebase --continue\")"
#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)"
#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (useu \"git rebase --abort\" per a agafar la branca original)"
#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
"«%s» en «%s»."
#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "Actualment esteu dividint una comissió durant un «rebase»."
#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una vegada que el vostre directori de treball sigui net, executeu \"git "
"rebase --continue\")"
#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu editant una comissió mentre es fa «rebase» de la branca "
"«%s» en «%s»."
#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Actualment esteu editant una comissió durant un «rebase»."
#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)"
#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els "
"vostres canvis)"
#: wt-status.c:1419
#, fuzzy
msgid "Cherry-pick currently in progress."
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
#: wt-status.c:1432
#, fuzzy
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue"
"\")"
#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry "
"pick»)"
#: wt-status.c:1447
#, fuzzy
msgid "Revert currently in progress."
msgstr "avorta la fusió en curs actual"
#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Actualment esteu revertint la comissió %s."
#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
#: wt-status.c:1459
#, fuzzy
msgid " (run \"git revert --continue\" to continue)"
msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Actualment esteu bisecant."
#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (useu \"git bisect reset\" per a tornar a la branca original)"
#: wt-status.c:1690
msgid "On branch "
msgstr "En la branca "
#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "«rebase» interactiu en curs; sobre "
#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "«rebase» en curs; sobre "
#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Actualment no s'és en cap branca."
#: wt-status.c:1726
msgid "Initial commit"
msgstr "Comissió inicial"
#: wt-status.c:1727
msgid "No commits yet"
msgstr "No s'ha fet cap comissió encara."
#: wt-status.c:1741
msgid "Untracked files"
msgstr "Fitxers no seguits"
#: wt-status.c:1743
msgid "Ignored files"
msgstr "Fitxers ignorats"
#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"may speed it up, but you have to be careful not to forget to add\n"
"new files yourself (see 'git help status')."
msgstr ""
"Ha trigat %.2f segons enumerar els fitxers no seguits.\n"
"'status -uno' pot accelerar-ho, però heu d'anar amb compte de no\n"
"oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
"'git help status')."
#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Els fitxers no seguits no estan llistats%s"
#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
#: wt-status.c:1761
msgid "No changes"
msgstr "Sense canvis"
#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "no hi ha canvis afegits a cometre\n"
#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add"
"\" per a seguir-los)\n"
#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n"
#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-"
"los)\n"
#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "no hi ha res a cometre\n"
#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
#: wt-status.c:1901
msgid "No commits yet on "
msgstr "No s'ha fet cap comissió encara a "
#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (sense branca)"
#: wt-status.c:1936
msgid "different"
msgstr "diferent"
#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "darrere "
#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "davant per "
#. TRANSLATORS: the action is e.g. "pull with rebase"
#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no es pot %s: Teniu canvis «unstaged»."
#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "addicionalment, el vostre índex conté canvis sense cometre."
#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "elimina «%s»\n"
#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "No s'ha pogut obrir «%s» per a escriptura."
#: builtin/add.c:249
msgid "Could not write patch"
msgstr "No s'ha pogut escriure el pedaç"
#: builtin/add.c:252
msgid "editing patch failed"
msgstr "l'edició del pedaç ha fallat"
#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "No s'ha pogut fer stat a «%s»"
#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "El pedaç és buit. S'ha avortat."
#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "No s'ha pogut aplicar «%s»"
#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "marxa en sec"
#: builtin/add.c:293
msgid "interactive picking"
msgstr "recull interactiu"
#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr "edita la diferència actual i aplica-la"
#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "permet afegir fitxers que d'altra manera s'ignoren"
#: builtin/add.c:297
msgid "update tracked files"
msgstr "actualitza els fitxers seguits"
#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "registra només el fet que el camí s'afegirà més tard"
#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "no afegeixis, només actualitza l'índex"
#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr "només omet els fitxers que no es poden afegir a causa d'errors"
#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "passa per alt el bit executable dels fitxers llistats"
#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "avisa'm quan s'afegeixi un dipòsit incrustat"
#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"Clones of the outer repository will not contain the contents of\n"
"the embedded repository and will not know how to obtain it.\n"
"If you meant to add a submodule, use:\n"
"\n"
"\tgit submodule add <url> %s\n"
"\n"
"If you added this path by mistake, you can remove it from the\n"
"index with:\n"
"\n"
"\tgit rm --cached %s\n"
"\n"
"See \"git help submodule\" for more information."
msgstr ""
"Heu afegit un altre dipòsit git dins del dipòsit actual.\n"
"Els clons de dipòsits externs no contindran els continguts de\n"
"del dipòsit incrustat i no sabran com obtenir-ho.\n"
"Si volíeu afegir un submòdul, useu:\n"
"\n"
"\tgit submodule add <url> %s\n"
"\n"
"Si heu afegit aquest camí per error, podeu suprimir-lo de\n"
"l'índex amb:\n"
"\n"
"\tgit rm --cached %s\n"
"\n"
"Vegeu \"git help submodule\" per a més informació."
#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "s'està afegint un dipòsit incrustat: %s"
#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Useu -f si realment els voleu afegir.\n"
#: builtin/add.c:379
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u són mútuament incompatibles"
#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run"
#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x"
#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "No s'ha especificat res, no s'ha afegit res.\n"
#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Potser volíeu dir «git add .»?\n"
#: builtin/am.c:348
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "s'ha suprimit «%s» pel lligam applypatch-msg"
#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: «%s»."
#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»"
#: builtin/am.c:538
msgid "fseek failed"
msgstr "fseek ha fallat"
#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç «%s»"
#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada"
#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "línia Date no vàlida"
#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "desplaçament de zona de temps no vàlid"
#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha produït un error en crear el directori «%s»"
#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "S'ha produït un error en dividir els pedaços."
#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."
#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això."
#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort"
"\"."
#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "El pedaç està buit."
#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "línia d'identitat no vàlida: %.*s"
#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
"vies."
#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..."
#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "S'ha produït un error en fusionar els canvis."
#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "s'està aplicant a una història buida"
#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
#.
#: builtin/am.c:1660
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls "
"tots: "
#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "S'està aplicant: %.*s"
#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
"Cap canvi - heu oblidat d'usar 'git add'?\n"
"Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n"
"introduït els mateixos canvis; potser voleu ometre aquest pedaç."
#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
"Encara teniu camins sense fusionar a l'índex.\n"
"Heu de fer 'git add' a cada fitxer amb conflictes resolts per marcar-los com "
"a tal.\n"
"Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel "
"fitxer."
#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "No s'ha pogut analitzar l'objecte «%s»."
#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "s'ha produït un error en netejar l'índex"
#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
"No s'està rebobinant a ORIG_HEAD"
#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
#: builtin/am.c:2171
msgid "run interactively"
msgstr "executa interactivament"
#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
#: builtin/repack.c:307 builtin/stash.c:806
msgid "be quiet"
msgstr "silenciós"
#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "passa l'indicador -k a git-mailinfo"
#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "passa l'indicador -b a git-mailinfo"
#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "passa l'indicador -m a git-mailinfo"
#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox"
#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "elimina tot abans d'una línia de tisores"
#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "passa-ho a través de git-apply"
#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324
#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç"
#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "omet el pedaç actual"
#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "restaura la branca original i avorta l'operació d'apedaçament."
#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "mostra el pedaç que s'està aplicant."
#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "ID de clau"
#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "signa les comissions amb GPG"
#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(ús intern per a git-rebase)"
#: builtin/am.c:2274
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
"Fa molt que l'opció -b/--binary no ha fet res, i\n"
"s'eliminarà. No l'useu més."
#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "S'ha produït un error en llegir l'índex"
#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"un directori de «rebase» anterior %s encara existeix però s'ha donat una "
"bústia."
#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
"S'ha trobat un directori %s extraviat.\n"
"Useu \"git am --abort\" per a eliminar-lo."
#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Una operació de resolució no està en curs; no reprenem."
#: builtin/am.c:2336
msgid "interactive mode requires patches on the command line"
msgstr ""
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcions>] [<pedaç>...]"
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»"
#: builtin/archive.c:20
msgid "could not redirect output"
msgstr "no s'ha pogut redirigir la sortida"
#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
msgstr "git archive: Remot sense URL"
#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: %s NACK"
#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive: error de protocol"
#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive: s'esperava una neteja"
#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
#: builtin/bisect--helper.c:25
#, fuzzy
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-clean-state"
#: builtin/bisect--helper.c:26
#, fuzzy
msgid ""
"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
"<bad_term>"
msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
#: builtin/bisect--helper.c:27
#, fuzzy
msgid ""
"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
"<bad_term>"
msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
#: builtin/bisect--helper.c:28
#, fuzzy
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
#: builtin/bisect--helper.c:29
#, fuzzy
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
msgstr ""
"paràmetre no vàlid $arg per a 'git bisect terms'.\n"
"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
#: builtin/bisect--helper.c:30
msgid ""
"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
msgstr ""
#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
msgstr "«%s» no és un terme vàlid"
#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "no es pot usar l'ordre interna «%s» com a terme"
#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "no es pot canviar el significat del terme «%s»"
#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "useu dos termes distintes"
#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "no s'ha pogut obrir el BISECT_TERMS"
#: builtin/bisect--helper.c:155
#, fuzzy, c-format
msgid "We are not bisecting.\n"
msgstr "No estem bisecant."
#: builtin/bisect--helper.c:163
#, fuzzy, c-format
msgid "'%s' is not a valid commit"
msgstr "«%s» no és un terme vàlid"
#: builtin/bisect--helper.c:174
#, fuzzy, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"No s'ha pogut agafar la HEAD original '$branch'.\n"
"Proveu 'git bisect reset <comissió>'."
#: builtin/bisect--helper.c:215
#, fuzzy, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Paràmetre bisect_write incorrecte: $state"
#: builtin/bisect--helper.c:220
#, fuzzy, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "no es pot canviar el significat del terme «%s»"
#: builtin/bisect--helper.c:232
#, fuzzy, c-format
msgid "couldn't open the file '%s'"
msgstr "no s'ha pogut crear el fitxer «%s»"
#: builtin/bisect--helper.c:258
#, fuzzy, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
"Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD."
#: builtin/bisect--helper.c:285
#, fuzzy, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
"Cal donar-me almenys una revisió $bad_syn i una $good_syn.\n"
"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
#: builtin/bisect--helper.c:289
#, fuzzy, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
"You then need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
"Cal començar amb \"git bisect start\".\n"
"Després cal donar-me almenys una revisió $good_syn i una $bad_syn.\n"
"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
#: builtin/bisect--helper.c:321
#, fuzzy, c-format
msgid "bisecting only with a %s commit"
msgstr "Advertència: bisecant amb només comissió $TERM_BAD."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#.
#: builtin/bisect--helper.c:329
msgid "Are you sure [Y/n]? "
msgstr "N'esteu segur [Y/n]? "
#: builtin/bisect--helper.c:376
msgid "no terms defined"
msgstr "cap terme definit"
#: builtin/bisect--helper.c:379
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr ""
#: builtin/bisect--helper.c:389
#, fuzzy, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
"paràmetre no vàlid $arg per a 'git bisect terms'.\n"
"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
#: builtin/bisect--helper.c:475
#, fuzzy, c-format
msgid "unrecognized option: '%s'"
msgstr "posició no reconeguda:%s"
#: builtin/bisect--helper.c:479
#, fuzzy, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'$arg' no sembla una revisió vàlida"
#: builtin/bisect--helper.c:511
#, fuzzy
msgid "bad HEAD - I need a HEAD"
msgstr "HEAD incorrecte - Cal un HEAD"
#: builtin/bisect--helper.c:526
#, fuzzy, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
"vàlida>'."
#: builtin/bisect--helper.c:547
msgid "won't bisect on cg-seek'ed tree"
msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek"
#: builtin/bisect--helper.c:550
#, fuzzy
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD incorrecte - referència simbòlica estranya"
#: builtin/bisect--helper.c:574
#, fuzzy, c-format
msgid "invalid ref: '%s'"
msgstr "fitxer no vàlid: «%s»"
#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "realitza 'git bisect next'"
#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "escriu els termes a .git/BISECT_TERMS"
#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "neteja l'estat de la bisecció"
#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "comprova les revisions esperades"
#: builtin/bisect--helper.c:638
#, fuzzy
msgid "reset the bisection state"
msgstr "neteja l'estat de la bisecció"
#: builtin/bisect--helper.c:640
#, fuzzy
msgid "write out the bisection state in BISECT_LOG"
msgstr "neteja l'estat de la bisecció"
#: builtin/bisect--helper.c:642
#, fuzzy
msgid "check and set terms in a bisection state"
msgstr "neteja l'estat de la bisecció"
#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr ""
#: builtin/bisect--helper.c:646
#, fuzzy
msgid "print out the bisect terms"
msgstr "imprimeix només les etiquetes de l'objecte"
#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr ""
#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual"
#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr ""
#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms requereix dos paràmetres"
#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state no accepta paràmetres"
#: builtin/bisect--helper.c:680
#, fuzzy
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-clean-state no accepta paràmetres"
#: builtin/bisect--helper.c:684
#, fuzzy
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-clean-state no accepta paràmetres"
#: builtin/bisect--helper.c:690
#, fuzzy
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--bisect-clean-state no accepta paràmetres"
#: builtin/bisect--helper.c:696
#, fuzzy
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-clean-state no accepta paràmetres"
#: builtin/bisect--helper.c:702
#, fuzzy
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--write-terms requereix dos paràmetres"
#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"
#: builtin/blame.c:410
#, fuzzy, c-format
msgid "expecting a color: %s"
msgstr "respecta els colors del format"
#: builtin/blame.c:417
msgid "must end with a color"
msgstr ""
#: builtin/blame.c:730
#, fuzzy, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
#: builtin/blame.c:748
#, fuzzy
msgid "invalid value for blame.coloring"
msgstr "valor no vàlid per a --missing"
#: builtin/blame.c:823
#, fuzzy, c-format
msgid "cannot find revision %s to ignore"
msgstr "no s'ha pogut resoldre la revisió: %s"
#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
"desactivat)"
#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Mostra les estadístiques de preu de treball"
#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Força l'informe de progrés"
#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades «blame»"
#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "Mostra el format de porcellana amb informació de comissió per línia"
#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: "
"desactivat)"
#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
#: builtin/blame.c:861 builtin/log.c:1646
msgid "rev"
msgstr "rev"
#: builtin/blame.c:861
#, fuzzy
msgid "Ignore <rev> when blaming"
msgstr "ignora l'índex en comprovar"
#: builtin/blame.c:862
#, fuzzy
msgid "Ignore revisions from <file>"
msgstr "llegiu el missatge des d'un fitxer"
#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr ""
#: builtin/blame.c:864
msgid "color lines by age"
msgstr ""
#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Usa un heurístic experimental per a millorar les diferències"
#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Gasta cicles extres per a trobar una coincidència millor"
#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Usa els continguts de <fitxer> com a la imatge final"
#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "puntuació"
#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Troba còpies de línia dins i a través dels fitxers"
#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Troba moviments de línia dins i a través dels fitxers"
#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "Processa només el rang de línies n,m, comptant des d'1"
#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"no es pot usar --progress amb els formats --incremental o de porcellana"
#. TRANSLATORS: This string is used to tell us the
#. maximum display width for a relative timestamp in
#. "git blame" output. For C locale, "4 years, 11
#. months ago", which takes 22 places, is the longest
#. among various forms of relative timestamps, but
#. your language may need more or fewer display
#. columns.
#.
#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "el fitxer %s té només %lu línia"
msgstr[1] "el fitxer %s té només %lu línies"
#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "S'està fent un «blame»"
#: builtin/branch.c:29
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
#: builtin/branch.c:31
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..."
#: builtin/branch.c:32
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"
#: builtin/branch.c:33
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<opcions>] (-c | -C) [<branca-antiga>] <branca-nova>"
#: builtin/branch.c:34
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opcions>] [-r | -a] [--format]"
#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
"s'està suprimint la branca «%s» que s'ha\n"
" fusionat a «%s», però encara no\n"
" s'ha fusionat a HEAD."
#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
"no s'està suprimint la branca «%s» que encara no\n"
" s'ha fusionat a «%s», encara que està\n"
" fusionada a HEAD."
#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "No s'ha pogut trobar l'objecte de comissió de «%s»"
#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
"La branca «%s» no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "no es pot usar -a amb -d"
#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "No es pot suprimir la branca «%s» agafada a «%s»"
#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "no s'ha trobat la branca amb seguiment remot «%s»."
#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "no s'ha trobat la branca «%s»."
#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Error en suprimir la branca amb seguiment remot «%s»"
#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Error en suprimir la branca «%s»"
#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"
#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "no s'ha pogut analitzar la cadena de format"
#: builtin/branch.c:460
#, fuzzy
msgid "could not resolve HEAD"
msgstr "no s'ha pogut resoldre la comissió HEAD"
#: builtin/branch.c:466
#, fuzzy, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD no trobat sota refs/heads!"
#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "S'està fent «rebase» en la branca %s a %s"
#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branca %s s'està bisecant a %s"
#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "no es pot copiar branca actual mentre no s'és a cap."
#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."
#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branca no vàlid: «%s»"
#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "La còpia de la branca ha fallat"
#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "S'ha creat una còpia d'una branca mal anomenada «%s»"
#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"
#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branca està canviada de nom, però l'actualització del fitxer de "
"configuració ha fallat"
#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La branca està copiada, però l'actualització del fitxer de configuració ha "
"fallat"
#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
"Editeu la descripció de la branca\n"
" %s\n"
"S'eliminaran les línies que comencin amb «%c».\n"
#: builtin/branch.c:618
msgid "Generic options"
msgstr "Opcions genèriques"
#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (vegeu git-pull(1))"
#: builtin/branch.c:624
msgid "do not use"
msgstr "no usar"
#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "font"
#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "canvia la informació de font"
#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Desassigna la informació de font"
#: builtin/branch.c:628
msgid "use colored output"
msgstr "usa sortida colorada"
#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "imprimeix només les branques que no continguin la comissió"
#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "mou/canvia de nom una branca i el seu registre de referència"
#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "copia una branca i el seu registre de referència"
#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "copia una branca, encara que el destí existeixi"
#: builtin/branch.c:646
msgid "list branch names"
msgstr "llista els noms de branca"
#: builtin/branch.c:647
#, fuzzy
msgid "show current branch name"
msgstr "No hi ha cap branca actual."
#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "imprimeix només les branques que s'han fusionat"
#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "imprimeix només les branques que no s'han fusionat"
#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "llista les branques en columnes"
#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
#: builtin/tag.c:433
msgid "object"
msgstr "objecte"
#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "imprimeix només les branques de l'objecte"
#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format a usar en la sortida"
#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "cal el nom de branca"
#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "no es pot editar la descripció de més d'una branca"
#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Encara no hi ha cap comissió en la branca «%s»."
#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "No hi ha cap branca amb nom «%s»."
#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "hi ha massa branques per a una operació de còpia"
#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "hi ha massa arguments per a una operació remota"
#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "hi ha massa arguments per a establir una nova font"
#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "no existeix la branca «%s»"
#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branca «%s» no existeix"
#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "hi ha massa arguments per a desassignar la font"
#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca."
#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branca «%s» no té informació de font"
#: builtin/branch.c:841
#, fuzzy
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96 af6b65d45e Git 2.26.2 7397ca3373 Git 2.25.4 b86a4be245 Git 2.24.3 f2771efd07 Git 2.23.3 c9808fa014 Git 2.22.4 9206d27eb5 Git 2.21.3 041bc65923 Git 2.20.4 76b54ee9b9 Git 2.19.5 ba6f0905fd Git 2.18.4 df5be6dc3f Git 2.17.5 1a3609e402 fsck: reject URL with empty host in .gitmodules e7fab62b73 credential: treat URL with empty scheme as invalid c44088ecc4 credential: treat URL without scheme as invalid fe29a9b7b0 credential: die() when parsing invalid urls a2b26ffb1a fsck: convert gitmodules url to URL passed to curl 8ba8ed568e credential: refuse to operate when missing host or protocol 24036686c4 credential: parse URL without host as empty host, not unset 73aafe9bc2 t0300: use more realistic inputs a88dbd2f8c t0300: make "quit" helper more realistic de49261b05 Git 2.26.1 274b9cc253 Git 2.26 55a7568606 Merge branch 'en/rebase-backend' c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git 1557364fb4 l10n: tr.po: change file mode to 644 2da1b05674 t3419: prevent failure when run with EXPENSIVE 1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0 5804c6ec40 l10n: de.po: add missing space 98cedd0233 Merge https://github.com/prati0100/git-gui 4914ba4bcf l10n: tr: Fix a couple of ambiguities a5728022e0 Merge branch 'py/remove-tcloo' 7fcb965970 RelNotes/2.26.0: fix various typos f0c03bcf95 l10n: Update Catalan translation 67b0a24910 Git 2.25.3 be8661a328 Sync with Git 2.25.2 0822e66b5d Git 2.25.2 65588b0b2e unicode: update the width tables to Unicode 13.0 7be274b0ff Merge branch 'js/ci-windows-update' into maint 9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint 221887a492 Merge branch 'jk/doc-credential-helper' into maint 32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint 618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint 50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint 41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint 2d7247af6f Merge branch 'am/mingw-poll-fix' into maint 4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint 76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint 569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint 16a4bf1035 Merge branch 'en/check-ignore' into maint 3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint 56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint 1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint 7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint 93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint 758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint 506223f9c5 Git 2.24.2 17a02783d8 Git 2.23.2 69fab82147 Git 2.22.3 fe22686494 Git 2.21.2 d1259ce117 Git 2.20.3 a5979d7009 Git 2.19.4 21a3e5016b Git 2.18.3 c42c0f1297 Git 2.17.4 d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u) 3891a84ccd git-gui: create a new namespace for chord script evaluation 8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5 440e7442d1 l10n: zh_CN: Revise v2.26.0 translation 2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 6c85aac65f Git 2.26-rc2 74f172e39e Merge branch 'en/test-cleanup' e96327c947 Merge branch 'es/outside-repo-errmsg-hints' ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 15fa8d9667 l10n: vi: fix translation + grammar 5c20398699 prefix_path: show gitdir if worktree unavailable 1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) a4a2f64642 Merge branch 'js/askpass-coerce-utf8' 850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows d769dcc5cd Merge branch 'py/blame-status-error' 70e24186c0 t6022, t6046: fix flaky files-are-updated checks 30e9940356 Hopefully the final batch before -rc2 b4f0038525 Merge branch 'en/rebase-backend' 25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master 07259e74ec fsck: detect gitmodules URLs with embedded newlines c716fe4bd9 credential: detect unrepresentable values when parsing urls 17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr 9a6bbee800 credential: avoid writing values with newlines 17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2 1afe18a3bb l10n: es: 2.26.0 round#2 5ab9217a3c Merge branch of github.com:alshopov/git-po into master c6713676d6 Merge branch of github.com:bitigchi/git-po into master b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t) 2713dec02d l10n: tr: v2.26.0 round 2 c9ef57cc3a l10n: fr : v2.26.0 rnd 2 120b1eb731 git-rebase.txt: highlight backend differences with commit rewording 9a1b7474d6 sequencer: clear state upon dropping a become-empty commit 937d143630 i18n: unmark a message in rebase.c a56d361f66 Merge branch 'ds/sparse-add' 5fa9169ced Merge branch 'dr/push-remote-ref-update' cdef998b46 Merge branch 'jc/doc-single-h-is-for-help' 051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) 52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master 9643441983 l10n: tr: Add glossary for Turkish translations 438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git 2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u) dd2c269652 l10n: tr: Add Turkish translations 8f4f099f8b l10n: tr: Add Turkish translation team info b4374e96c8 Git 2.26-rc1 4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch' 3658d77f8e Merge branch 'hd/show-one-mergetag-fix' 6125104b88 Merge branch 'rt/format-zero-length-fix' 1ac37deba2 Merge branch 'am/mingw-poll-fix' cf372dc815 Merge branch 'en/test-cleanup' d1075adfdf Merge branch 'en/merge-path-collision' a4fd114ffc Merge branch 'kk/complete-diff-color-moved' a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file' 0e0d717537 Merge branch 'pb/am-show-current-patch' 9b7f726dfc Merge branch 'am/pathspec-f-f-more' 4605a73073 t1091: don't grep for `strerror()` string 4d9c2902a1 l10n: fr v2.26.0 rnd1 ad182bee3f Merge branch of github.com:alshopov/git-po into master 23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1 98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t) f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed) 76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po 076cbdcd73 Git 2.26-rc0 0d65f3fb1a t5537: adjust test_oid label e63cefb024 Merge branch 'hi/gpg-use-check-signature' 5da7329e29 Merge branch 'rs/commit-graph-code-simplification' 0108fc1b46 Merge branch 'js/ci-windows-update' f3ccd9f0d9 Merge branch 'be/describe-multiroot' a6b4709302 Merge branch 'ag/rebase-remove-redundant-code' b22db265d6 Merge branch 'es/recursive-single-branch-clone' e8e71848ea Merge branch 'jk/nth-packed-object-id' a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch' 4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere' 49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix' 2cbb058669 Merge branch 'bc/wildcard-credential' 25063e2530 Merge branch 'mr/bisect-in-c-1' f4d7dfce4d Merge branch 'ds/sparse-add' 4d864895a2 t2402: test worktree path when called in .git directory af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch() 7655b4119d remote-curl: show progress for fetches over dumb HTTP 2f268890c2 The eighth batch for 2.26 aa5a7e02ad Merge branch 'ma/test-cleanup' 58595e713c Merge branch 'rs/blame-typefix-for-fingerprint' ff41848e99 Merge branch 'rs/micro-cleanups' 4cbf1a0e22 Merge branch 'es/worktree-cleanup' 46703057c1 Merge branch 'ak/test-log-graph' 777815f5f9 Merge branch 'jk/run-command-formatfix' 444cff61b4 Merge branch 'ds/partial-clone-fixes' 48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure' 8c22bd9ff9 Merge branch 'en/rebase-backend' cb2f5a8e97 Merge branch 'en/check-ignore' 0df82d99da Merge branch 'jk/object-filter-with-bitmap' 80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix' 29b09c518c Merge branch 'jk/doc-diff-parallel' 237a28173f show_one_mergetag: print non-parent in hex form. 5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context" 6d1210e133 l10n: Update Catalan translation 0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification" 7329d94be7 config.mak.dev: re-enable -Wformat-zero-length 7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings 94f4d01932 mingw: workaround for hangs when sending STDIN 1ff466c018 Documentation: clarify that `-h` alone stands for `help` 65bf820d0e t6020: new test with interleaved lexicographic ordering of directories 9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it d5bb92eced t3035: prefer test_must_fail to bash negation for git commands b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions 42d180dd01 t602[1236], t6034: modernize test formatting 802050400a merge-recursive: apply collision handling unification to recursive case 7f487ce062 Azure Pipeline: switch to the latest agent pools 5ed9fc3fc8 ci: prevent `perforce` from being quarantined eafff6e41e t/lib-httpd: avoid using macOS' sed d68ce906c7 commit-graph: use progress title directly 30b1c7ad9d describe: don't abort too early when searching tags 240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to' 2d2118b814 The seventh batch for 2.26 325eb66830 Merge branch 'es/doc-mentoring' 87f17d790d Merge branch 'es/bright-colors' d0038f4b31 Merge branch 'bw/remote-rename-update-config' 132f600b06 clone: pass --single-branch during --recurse-submodules 47319576f1 submodule--helper: use C99 named initializer ffe005576a lib-log-graph: consolidate colored graph cmp logic 989eea958b lib-log-graph: consolidate test_cmp_graph logic bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching bb4995fc3f worktree: add utility to find worktree by pathname a80c4c2214 worktree: improve find_worktree() documentation 2fecc48cad packfile: drop nth_packed_object_sha1() 6ac9760a30 packed_object_info(): use object_id internally for delta base b99b6bcc57 packed_object_info(): use object_id for returning delta base 63f4a7fc01 pack-check: push oid lookup into loop e31c71083a pack-check: convert "internal error" die to a BUG() 500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps f66d4e0250 pack-objects: use object_id struct in pack-reuse code a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id 3f83fd5e44 pack-objects: read delta base oid into object_id struct 0763671b8e nth_packed_object_oid(): use customary integer return 02bbbe9df9 worktree: drop unused code from get_main_worktree() 27f182b3fc blame: provide type of fingerprints pointer b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere df126ca142 t3400: make test clean up after itself 3c29e21eb0 t: drop debug `cat` calls cac439b56d t9810: drop debug `cat` call 91de82adc9 t4117: check for files using `test_path_is_file` 4ef346482d receive.denyCurrentBranch: respect all worktrees f8692114db t5509: use a bare repository for test push target 45f274fbb1 get_main_worktree(): allow it to be called in the Git directory fd0bc17557 completion: add diff --color-moved[-ws] 2ce6d075fa use strpbrk(3) to search for characters from a given set 2b3c430bce quote: use isalnum() to check for alphanumeric characters a51d9e8f07 t1050: replace test -f with test_path_is_file 3e96c66805 partial-clone: avoid fetching when looking for objects d0badf8797 partial-clone: demonstrate bugs in partial fetch 539052f42f run-command.h: fix mis-indented struct member 6c11c6a124 sparse-checkout: allow one-character directories in cone mode aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch e8ef1e8d6e am: convert "resume" variable to a struct bc8620b440 parse-options: convert "command mode" to a flag 62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE() 46fd7b3900 credential: allow wildcard patterns when matching config 82eb249853 credential: use the last matching username in the config 588c70e10f t0300: add tests for some additional cases 732f934408 t1300: add test for urlmatch with multiple wildcards 3fa0e04667 mailmap: add an additional email address for brian m. carlson 8a98758a8d stash push: support the --pathspec-from-file option 8c3713cede stash: eliminate crude option parsing 3f3d8068f5 doc: stash: synchronize <pathspec> description b22909144c doc: stash: document more options 0093abc286 doc: stash: split options from description (2) 2b7460d167 doc: stash: split options from description (1) 5f393dc3aa rm: support the --pathspec-from-file option fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags 73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure 6c69f22233 bisect: libify `bisect_next_all` 9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents 45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents e8e3ce6718 bisect: libify `bisect_checkout` ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents 7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()` 680e8a01e5 bisect: add enum to represent bisect returning codes bfacfce7d9 bisect--helper: introduce new `decide_next()` function b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0 292731c4c2 bisect--helper: change `retval` to `res` 16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays 7ec8125fba check-ignore: fix documentation and implementation to match 2607d39da3 doc-diff: use single-colon rule in rendering Makefile 0aa6ce3094 doc/config/push: use longer "--" line for preformatted example 20a5fd881a rev-list --count: comment on the use of count_right++ 63a58457e0 Merge branch 'py/missing-bracket' 51ebf55b93 The sixth batch for 2.26 f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints' 123538444f Merge branch 'jk/doc-credential-helper' e154451a2f Merge branch 'js/mingw-open-in-gdb' fc25a19265 Merge branch 'js/test-unc-fetch' 6365058605 Merge branch 'js/test-avoid-pipe' 966b69f02f Merge branch 'js/test-write-junit-xml-fix' d880c3de23 Merge branch 'jk/mailinfo-cleanup' 5d55554b1d Merge branch 'mr/show-config-scope' 9f3f38769d Merge branch 'rs/strbuf-insertstr' cbecc168d4 Merge branch 'rs/parse-options-concat-dup' 5af345a438 Merge branch 'bc/hash-independent-tests-part-8' 0460c109c3 Merge branch 'rs/name-rev-memsave' 6b9919c0a2 git-gui: add missing close bracket 5897e5ac96 Merge branch 'cs/german-translation' cf85a32eb6 git-gui: update German translation 5096e51c54 git-gui: extend translation glossary template with more terms 8b85bb1b70 git-gui: update pot template and German translation to current source code e68e29171c Sync with 2.25.1 c522f061d5 Git 2.25.1 10cdb9f38a rebase: rename the two primary rebase backends 2ac0d6273f rebase: change the default backend from "am" to "merge" 8295ed690b rebase: make the backend configurable via config setting 76340c8107 rebase tests: repeat some tests using the merge backend instead of am 980b482d28 rebase tests: mark tests specific to the am-backend with --am c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases 6d04ce75c4 git-prompt: change the prompt for interactive-based rebases 52eb738d6b rebase: add an --am option 8af14f0859 rebase: move incompatibility checks between backend options a bit earlier be50c938df git-rebase.txt: add more details about behavioral differences of backends befb89ce7c rebase: allow more types of rebases to fast-forward 9a70f3d4ae t3432: make these tests work with either am or merge backends 93122c985a rebase: fix handling of restrict_revision 55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer 8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling 7db00f0b3b t3406: simplify an already simple test e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty d48e5e21da rebase (interactive-backend): make --keep-empty the default e0020b2f82 prefix_path: show gitdir when arg is outside repo cc4f2eb828 doc: move credential helper info into gitcredentials(7) bfdd66e72f Sync with maint 7ae7e234c7 The fifth batch for 2.26 53c3be2c29 Merge branch 'tb/commit-graph-object-dir' 7b029ebaef Merge branch 'jk/index-pack-dupfix' aa21cc97bd Merge branch 'jk/alloc-cleanups' 883326077a Merge branch 'jh/notes-fanout-fix' f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule' 78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs' df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' 433b8aac2e Merge branch 'ds/sparse-checkout-harden' 4a77434bc8 Merge branch 'ld/p4-cleanup-processes' 8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone' 09e48400a3 Merge branch 'jk/get-oid-error-message-i18n' 4dbeecba27 Merge branch 'ag/edit-todo-drop-check' f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2' d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout' 251187084d Merge branch 'js/rebase-i-with-colliding-hash' c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix' 56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store' 0da63da794 Merge branch 'jn/promote-proto2-to-default' a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup' daef1b300b Merge branch 'hw/advice-add-nothing' 6141e0cc00 Merge branch 'js/convert-typofix' into maint 4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint 5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint 7137d6089b Merge branch 'ms/doc-bundle-format' into maint 52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint 0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint 1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint 153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint 8857657cc9 Merge branch 'jt/t5616-robustify' into maint 1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint f468972671 Merge branch 'bc/misconception-doc' into maint 6e69042e26 Merge branch 'bc/author-committer-doc' into maint 650ed395be Merge branch 'ds/refmap-doc' into maint 80b806f1a8 Merge branch 'bc/actualmente' into maint eceff4ba12 Merge branch 'rt/submodule-i18n' into maint 8a17eb7972 Merge branch 'jk/test-fixes' into maint 54bbadaeca Merge branch 'jk/asan-build-fix' into maint 8dbeba198e Merge branch 'ds/sparse-cone' into maint e361f36f61 Merge branch 'nd/switch-and-restore' into maint 4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint 5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint 9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint 3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint 3ab3185f99 pack-objects: support filters with bitmaps 84243da129 pack-bitmap: implement BLOB_LIMIT filtering 4f3bd5606a pack-bitmap: implement BLOB_NONE filtering cc4aa28506 bitmap: add bitmap_unset() function 2aaeb9ac41 rev-list: use bitmap filters for traversal 6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure 4eb707ebd6 rev-list: allow commit-only bitmap traversals ea047a8eb4 t5310: factor out bitmap traversal comparison 608d9c9365 rev-list: allow bitmaps when counting objects 55cb10f9b5 rev-list: make --count work with --objects 792f811998 rev-list: factor out bitmap-optimized routines d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs 08809c09aa mingw: add a helper function to attach GDB to the current process bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths de26f02db1 t9001, t9116: avoid pipes a2dc43414c MyFirstContribution: rephrase contact info e03f928e2a rev-list: fallback to non-bitmap traversal when filtering acac50dd8c pack-bitmap: fix leak of haves/wants object lists 551cf8b655 pack-bitmap: factor out type iterator initialization d8437c57fa The fourth batch for 2.26 a3dcf84df0 Merge branch 'js/convert-typofix' 0de2d1409b Merge branch 'js/ci-squelch-doc-warning' 0410c2ba31 Merge branch 'jb/multi-pack-index-docfix' 0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example' e99c325bb4 Merge branch 'ms/doc-bundle-format' afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix' db72f8c940 Merge branch 'jb/parse-options-message-fix' 3d2471ba85 Merge branch 'ma/filter-branch-doc-caret' b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path' 44cba9c4b3 Merge branch 'jc/skip-prefix' 556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index' 17e4a1b141 Merge branch 'hw/doc-git-dir' 4cf7f48891 Merge branch 'jk/push-default-doc' b783391018 Merge branch 'jk/clang-sanitizer-fixes' a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache' 3f7553acf5 Merge branch 'jt/t5616-robustify' 341f8a6476 Merge branch 'jk/escaped-wildcard-dwim' b486d2ee81 Merge branch 'jn/pretend-object-doc' 076ee3e8a2 tests: fix --write-junit-xml with subshells 2b0f19fa7a convert: fix typo c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors 1751b09a92 color.c: support bright aixterm colors 4a28eb0ae4 color.c: refactor color_output arguments f696a2b1c8 mailinfo: factor out some repeated header handling ffbea1816d mailinfo: be more liberal with header whitespace f447d0293e mailinfo: simplify parsing of header values b6537d83ee mailinfo: treat header values as C strings ef07659926 sparse-checkout: work with Windows paths 2631dc879d sparse-checkout: create 'add' subcommand 4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand 6fb705abcb sparse-checkout: extract add_patterns_from_input() b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config f2a2327a4a config: provide access to the current line number 923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values ceff1a1308 remote: clean-up config callback 1a83068c26 remote: clean-up by returning early to avoid one indentation 88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types 145d59f482 config: add '--show-scope' to print the scope of a config value 9a83d088ee submodule-config: add subomdule config scope e37efa40e1 config: teach git_config_source to remember its scope 5c105a842e config: preserve scope in do_git_config_sequence 6766e41b8a config: clarify meaning of command line scoping 6dc905d974 config: split repo scope to local and worktree a5cb4204b6 config: make scope_name non-static and rename it 30183894ea ci: ignore rubygems warning in the "Documentation" job 7a9f8ca805 parse-options: simplify parse_options_dup() c84078573e parse-options: const parse_options_concat() parameters f904f9025f parse-options: factor out parse_options_count() a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat() 517b60564e mailinfo: don't insert header prefix for handle_content_type() a91cc7fad0 strbuf: add and use strbuf_insertstr() eb31044ff7 pack-format: correct multi-pack-index description 9299f84921 diff-options.txt: avoid "regex" overload in example 7378ec90e1 doc: describe Git bundle format f3037657e8 t6024: update for SHA-256 edf04243b2 t6006: make hash size independent 5db24dcffd t6000: abstract away SHA-1-specific constants d341e0805d t5703: make test work with SHA-256 88ed241a7e t5607: make hash size independent 48c10cc0e6 t5318: update for SHA-256 f7ae8e69b6 t5515: make test hash independent e70649bb66 t5321: make test hash independent a30f93b143 t5313: make test hash independent a79eec220b t5309: make test hash independent 796d1383a3 t5302: make hash size independent 417e45e5e3 t4060: make test work with SHA-256 dfa5f53e78 t4211: add test cases for SHA-256 f743e8f5b3 t4211: move SHA-1-specific test cases into a directory 72f936b120 t4013: make test hash independent 5df0f11f07 t3311: make test work with SHA-256 07877f393c t3310: make test work with SHA-256 6025e898d6 t3309: make test work with SHA-256 7b1a1822fe t3308: make test work with SHA-256 94db7e3e93 t3206: make hash size independent db12505c2c t/lib-pack: support SHA-256 303b3c1c46 submodule: add newline on invalid submodule error 887a0fd573 add: change advice config variables used by the add API de93cc14ab The third batch for 2.26 ea46d9097b Merge branch 'mt/sparse-checkout-doc-update' ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix' b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend' 7ab963e122 Merge branch 'en/fill-directory-fixes-more' f52ab33616 Merge branch 'bc/hash-independent-tests-part-7' 25794d6ce9 Merge branch 'km/submodule-add-errmsg' d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity' 76c57fedfa Merge branch 'js/add-p-leftover-bits' 9a5315edfd Merge branch 'js/patch-mode-in-others-in-c' 381e8e9de1 Merge branch 'dl/test-must-fail-fixes' 395518cf7a parse-options: lose an unnecessary space in an error message 079f970971 name-rev: sort tip names before applying 2d53975488 name-rev: release unused name strings 977dc1912b name-rev: generate name strings only if they are better 1c56fc2084 name-rev: pre-size buffer in get_parent_name() ddc42ec786 name-rev: factor out get_parent_name() f13ca7cef5 name-rev: put struct rev_name into commit slab d689d6d82f name-rev: don't _peek() in create_or_update_name() 15a4205d96 name-rev: don't leak path copy in name_ref() 36d2419c9a name-rev: respect const qualifier 71620ca86c name-rev: remove unused typedef 3e2feb0d64 name-rev: rewrite create_or_update_name() a21781011f index-pack: downgrade twice-resolved REF_DELTA to die() dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout e1c5253951 t3305: check notes fanout more carefully and robustly e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st' ad2dd5bb63 commit-graph.c: remove path normalization, comparison 13c2499249 commit-graph.h: store object directory in 'struct commit_graph' 0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context' f38c92452d t7400: testcase for submodule status on unregistered inner git repos 5290d45134 tree-walk.c: break circular dependency with unpack-trees f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode e53ffe2704 sparse-checkout: escape all glob characters on write e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand bd64de42de sparse-checkout: unquote C-style strings over --stdin d585f0e799 sparse-checkout: write escaped patterns in cone mode 4f52c2ce6c sparse-checkout: properly match escaped characters 9abc60f801 sparse-checkout: warn on globs in cone patterns 145136a95a C: use skip_prefix() to avoid hardcoded string length 04e5b3f0b4 submodule foreach: replace $path with $sm_path in example 1793280e91 t5318: don't pass non-object directory to '--object-dir' da8063522f diff: move diff.wsErrorHighlight to "basic" config b98d188581 sha1-file: allow check_object_signature() to handle any repo 2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file() 7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare() c8123e72f6 streaming: allow open_istream() to handle any repo 5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile() a651946730 cache-tree: use given repo's hash_algo at verify_one() eb999b3295 diff: make diff_populate_filespec() honor its repo argument 5b0ca878e0 Sync with maint 344ee18728 The second batch 53a83299c7 Merge branch 'bc/misconception-doc' c9ccf9d09b Merge branch 'bc/author-committer-doc' 0d0fa20c40 Merge branch 'ss/t6025-modernize' 7050624abc Merge branch 'lh/bool-to-type-bool' 4b69f29271 Merge branch 'ds/refmap-doc' aff812ce3c Merge branch 'bc/actualmente' 38fb56e92a Merge branch 'rt/submodule-i18n' f0940743fa Merge branch 'js/builtin-add-i-cmds' 0afeb3fdf4 Merge branch 'jk/test-fixes' 808dab2b58 Merge branch 'jk/asan-build-fix' fec1ff97c2 Merge branch 'sg/completion-worktree' c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function' 11ad30b887 Merge branch 'hi/gpg-mintrustlevel' 96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases' d52adee779 Merge branch 'ds/graph-horizontal-edges' 6909474491 Merge branch 'am/update-pathspec-f-f-tests' 043426c8fd Merge branch 'ds/sparse-cone' 34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig' 8dd40c0472 traverse_trees(): use stack array for name entries 667b76ec58 walker_fetch(): avoid raw array length computation 9734b74a8f normalize_path_copy(): document "dst" size expectations 43f33e492a git-p4: avoid leak of file handle when cloning 19fa5ac333 git-p4: check for access to remote host earlier 6026aff5bb git-p4: cleanup better on error exit ca5b5cce62 git-p4: create helper function importRevisions() 4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable 5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce 837b3a6376 git-p4: make closeStreams() idempotent b0418303b1 sha1-name: mark get_oid() error messages for translation 2df1aa239c fetch: forgo full connectivity check if --filter 50033772d5 connected: verify promisor-ness of partial clone d82ad54945 git: update documentation for --git-dir 0ad7144999 .mailmap: map Yi-Jyun Pan's email c56c48dd07 grep: ignore --recurse-submodules if --no-index is given 8b2a1928f0 doc: drop "explicitly given" from push.default description cf82bff73f obstack: avoid computing offsets from NULL pointer 3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer d20bc01a51 avoid computing zero offsets from NULL pointer 7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero bc3f657f71 t1506: drop space after redirection operator e5d7b2f65c t1400: avoid "test" string comparisons 5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c c7a6207591 Sync with maint 7210ca4ee5 .mailmap: fix GGG authoship screwup 37a63faae5 t4124: only mark git command with test_must_fail a8c663cf65 t3507: use test_path_is_missing() 2def7f017c t3507: fix indentation e8a1c686ae t3504: do check for conflict marker after failed cherry-pick 1c9fd32fd2 t3419: stop losing return code of git command c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}() a781cd6fef t3415: stop losing return codes of git commands 86ce6e0dd1 t3310: extract common notes_merge_files_gone() 245b9ba0ba t3030: use test_path_is_missing() 4a6f11fd7b t2018: replace "sha" with "oid" 62e80fcb48 t2018: don't lose return code of git commands 30c0367668 t2018: teach do_checkout() to accept `!` arg 40caa5366a t2018: be more discerning when checking for expected exit codes b54128bb0b t5616: make robust to delta base change 4c616c2ba1 merge-recursive: use subtraction to flip stage ee798742bd merge-recursive: silence -Wxor-used-as-pow warning 39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin 3b2885ec9b submodule: fix status of initialized but not cloned submodules ace912bfb8 t7400: add a testcase for submodule status on empty dirs 4bb4fd4290 MyFirstContribution: add avenues for getting help 9e6d3e6417 sparse-checkout: detect short patterns 41de0c6fbc sparse-checkout: cone mode does not recognize "**" 7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone 47dbf10d8a clone: fix --sparse option with URLs 3c754067a1 sparse-checkout: create leading directories d622c34396 t1091: improve here-docs 522e641748 t1091: use check_files to reduce boilerplate 417be08d02 t1300: create custom config file without special characters 3de7ee369b t1300: fix over-indented HERE-DOCs 329e6ec397 config: fix typo in variable name 767a9c417e rebase -i: stop checking out the tip of the branch to rebase dfaed02862 fsmonitor: update documentation for hook version and watchman hooks e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2 d031049da3 completion: add support for sparse-checkout a402723e48 doc: sparse-checkout: mention --cone option 26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck b6992261de rebase -i: re-fix short SHA-1 collision d859dcad94 parse_insn_line(): improve error message when parsing failed d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects 92fb0db94c pack-objects: add checks for duplicate objects bb514de356 pack-objects: improve partial packfile reuse ff483026a9 builtin/pack-objects: introduce obj_is_packed() e704fc7978 pack-objects: introduce pack.allowPackReuse 2f4af77699 csum-file: introduce hashfile_total() 8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting() 59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile 40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains() 14fbd26044 ewah/bitmap: introduce bitmap_word_alloc() bc7a3d4dc0 The first batch post 2.25 cycle 09e393d913 Merge branch 'nd/switch-and-restore' 45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' 0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout' 36da2a8635 Merge branch 'es/unpack-trees-oob-fix' 42096c778d Merge branch 'bc/run-command-nullness-after-free-fix' 1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted' a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees' e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached' 9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting' 237a83a943 Merge branch 'dl/credential-netrc' a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir() 129510a067 t2405: clarify test descriptions and simplify test 4eaadc8493 t2405: use git -C and test_commit -C instead of subshells 773c60a45e t7410: rename to t2405-worktree-submodule.sh 7a2dc95cbc docs: mention when increasing http.postBuffer is valuable 1b13e9032f doc: dissuade users from trying to ignore tracked files 69e104d70e doc: provide guidance on user.name format 813f6025a5 docs: expand on possible and recommended user config options bc94e5862a doc: move author and committer information to git-commit(1) 7979dfe1d4 l10n: Update Catalan translation 81e3db42f3 templates: fix deprecated type option `--bool` c513a958b6 t6025: use helpers to replace test -f <path> 70789843bd t6025: modernize style 6a7aca6f01 doc: rm: synchronize <pathspec> description 856249c62a docs: use "currently" for the present time b40a50264a fetch: document and test --refmap="" a9ae8fde2e t3404: directly test the behavior of interest 22a69fda19 git-rebase.txt: update description of --allow-empty-message f1928f04b2 grep: use no. of cores as the default no. of threads 70a9fef240 grep: move driver pre-load out of critical section 1184a95ea2 grep: re-enable threads in non-worktree case 6c307626f1 grep: protect packed_git [re-]initialization c441ea4edc grep: allow submodule functions to run in parallel d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules() 1d1729caeb grep: replace grep_read_mutex by internal obj read lock 31877c9aec object-store: allow threaded access to object reading b1fc9da1c8 replace-object: make replace operations thread-safe d5b0bac528 grep: fix racy calls in grep_objects() faf123c730 grep: fix race conditions at grep_submodule() c3a5bb31c1 grep: fix race conditions on userdiff calls 0222540827 fetch: emphasize failure during submodule fetch 232378479e Sync with maint e4837b4406 t7800: don't rely on reuse_worktree_file() fbce03d329 t4018: drop "debugging" cat from hunk-header tests f65d07fffa Makefile: use compat regex with SANITIZE=address 849e43cc18 built-in add -i: accept open-ended ranges again d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files a4ffbbbb99 submodule.c: mark more strings for translation 0cbb60574e dir: point treat_leading_path() warning to the right place ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent 22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2 f365bf40a0 clean: demonstrate a bug with pathspecs b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x 277eb5af7c t5604: make hash independent 44b6c05b43 t5601: switch into repository to hash object 7a868c51c2 t5562: use $ZERO_OID 1b8f39fb0d t5540: make hash size independent a8c17e3bd6 t5537: make hash size independent 832072219c t5530: compute results based on object length 74ad99b1d8 t5512: abstract away SHA-1-specific constants ba1be1ab45 t5510: make hash size independent cba472d3ad t5504: make hash algorithm independent 82d5aeb1e6 t5324: make hash size independent 3c5e65cac1 t5319: make test work with SHA-256 235d3cddb8 t5319: change invalid offset for SHA-256 compatibility 1d86c8f0ce t5318: update for SHA-256 525a7f1769 t4300: abstract away SHA-1-specific constants 7a1bcb251b t4204: make hash size independent cb78f4f0fe t4202: abstract away SHA-1-specific constants 717c939d8f t4200: make hash size independent 08a9dd891c t4134: compute appropriate length constant 215b60bf07 t4066: compute index line in diffs 194264c185 t4054: make hash-size independent 7d5ecd775d completion: list paths and refs for 'git worktree add' 3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands 3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options 367efd54b3 completion: return the index of found word from __git_find_on_cmdline() d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function 2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper 54887b4689 gpg-interface: add minTrustLevel as a configuration option 684ceae32d fetch: default to protocol version 2 33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION 8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate b9ab170752 config doc: protocol.version is not experimental 07ef3c6604 fetch test: use more robust test for filtered objects d6509da620 fetch test: mark test of "skipping" haves as v0-only a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function bf66db37f1 add: use advise function to display hints c958d3bd0a graph: fix collapse of multiple edges 8588932e20 graph: add test to demonstrate horizontal line bug d0d0a357a1 t: directly test parse_pathspec_file() 568cabb2fe t: fix quotes tests for --pathspec-from-file f94f7bd00d t: add tests for error conditions with --pathspec-from-file b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job 12acdf573a built-in add -p: handle Escape sequences more efficiently e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode 04f816b125 built-in add -p: respect the `interactive.singlekey` config setting a5e46e6b01 terminal: add a new function to read a single keystroke 9ea416cb51 terminal: accommodate Git for Windows' default terminal 94ac3c31f7 terminal: make the code of disable_echo() reusable 08b1ea4c39 built-in add -p: handle diff.algorithm 180f48df69 built-in add -p: support interactive.diffFilter 1e4ffc765d t3701: adjust difffilter test c81638541c submodule add: show 'add --dry-run' stderr when aborting 8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token 56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token d0654dc308 Git 2.25 b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po 4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'" ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1 e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master 1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' d78a1968c5 Merge branch 'ma/config-advice-markup-fix' a20ae3ee29 l10n: Update Catalan translation 49e268e23e mingw: safeguard better against backslashes in file names 4c6c7971e0 unpack-trees: correctly compute result count 63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1 75449c1b39 l10n: de.po: Reword generation numbers 6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t) 3901d2c6bd config/advice.txt: fix description list separator 7a6a90c6ec Git 2.25-rc2 1f5f3ffe5c Merge branch 'ds/graph-assert-fix' a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix' 202f68b252 Merge branch 'pm/am-in-body-header-doc-update' 7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix' c5dc20638b Merge branch 'do/gitweb-typofix-in-comments' fe47c9cb5f Merge https://github.com/prati0100/git-gui a1087c9367 graph: fix lack of color in horizontal lines 0d251c3291 graph: drop assert() for merge with two collapsing parents 4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper 573117dfa5 unpack-trees: watch for out-of-range index position e701bab3e9 restore: invalidate cache-tree when removing entries with --staged 1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command fa74180d08 checkout: don't revert file on ambiguous tracking branches 2957709bd4 parse_branchname_arg(): extract part as new function 5020f6806a t2018: improve style of if-statement 7ffb54618b t2018: add space between function name and () 63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH 065027ee1a string-list: note in docs that callers can specify sorting function 26f924d50e unpack-trees: exit check_updates() early if updates are not wanted 042ed3e048 The final batch before -rc2 0f1930cd1b Merge branch 'ds/sparse-cone' 037f067587 Merge branch 'ds/commit-graph-set-size-mult' f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify' c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode' a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' c4117fcb97 Merge branch 'pb/clarify-line-log-doc' 556f0258df Merge branch 'ew/packfile-syscall-optim' 5814d44d9b doc: submodule: fix typo for command absorbgitdirs 7047f75f22 editorconfig: indent text files with tabs 60440d72db sha1-file: document how to use pretend_object_file 7fdc5f296f l10n: es: 2.25.0 round #1 f8740c586b am: document that Date: can appear as an in-body header 4e2c4c0d4f gitweb: fix a couple spelling errors in comments 421c0ffb02 multi-pack-index: correct configuration in documentation 757ff352bd Documentation/git-sparse-checkout.txt: fix a typo 0d2116c644 Merge branch 'zs/open-current-file' 9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u) 3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master 4c5081614c l10n: fr.po v2.25.0 rnd 1 5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0 63020f175f commit-graph: prefer default size_mult when given zero 224c7d70fa mingw: only test index entries for backslashes, not tree entries 9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED 8679ef24ed Git 2.25-rc1 a82027e9e6 Merge branch 'js/use-test-tool-on-path' 13432fc6dd Merge branch 'js/mingw-reserved-filenames' e0e1ac5db0 Merge branch 'en/rebase-signoff-fix' b76a244c9d Merge branch 'em/freebsd-cirrus-ci' bc855232bc Merge branch 'bk/p4-misc-usability' 763a59e71c merge-recursive: remove unnecessary oid_eq function 44143583b7 sparse-checkout: use extern for global variables d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master 13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1 786f4d2405 git-gui: allow opening currently selected file in default app 4fd683b6a3 sparse-checkout: document interactions with submodules de11951b03 sparse-checkout: list directories in cone mode 0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0 578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) 173fff68da Merge tag 'v2.25.0-rc0' into git-po-master f1842ff531 t2018: remove trailing space from test description 20a67e8ce9 t3008: find test-tool through path lookup 9e341f62ca l10n: Update Catalan translation 4e61b2214d packfile: replace lseek+read with pread ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision 2be45868a8 doc: log, gitk: document accepted line-log diff formats 280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD 0a76bd7381 mailmap: mask accentless variant for Công Danh 99c33bed56 Git 2.25-rc0 d2189a721c Merge branch 'en/fill-directory-fixes' 8be0a428d6 Merge branch 'rs/test-cleanup' 65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string' c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 45b96a6fa1 Merge branch 'js/add-p-in-c' ccc292e862 Merge branch 'jc/drop-gen-hdrs' dfee504bee Merge branch 'ja/doc-markup-cleanup' 87cbb1ca66 Merge branch 'rs/ref-read-cleanup' 20aa6d88b7 Merge branch 'rb/p4-lfs' fcd5b55f56 Merge branch 'pb/submodule-doc-xref' 4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free' ba6b66281e Merge branch 'ln/userdiff-elixir' bd72a08d6c Merge branch 'ds/sparse-cone' f3c520e17f Merge branch 'sg/name-rev-wo-recursion' 6514ad40a1 Merge branch 'ra/t5150-depends-on-perl' 17066bea38 Merge branch 'dl/format-patch-notes-config-fixup' 135365dd99 Merge branch 'am/pathspec-f-f-checkout' ff0cb70d45 Merge branch 'am/pathspec-from-file' 4dc42c6c18 mingw: refuse paths containing reserved names 98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16 c480eeb574 commit --interactive: make it work with the built-in `add -i` cee6cb7300 built-in add -p: implement the "worktree" patch modes 52628f94fc built-in add -p: implement the "checkout" patch modes 6610e4628a built-in stash: use the built-in `git add -p` if so configured 90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting 36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes d2a233cb8b built-in add -p: prepare for patch modes other than "stage" 761e3d26bb sparse-checkout: improve OS ls compatibility 6579d93a97 contrib/credential/netrc: work outside a repo 1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI b441717256 t1507: inline full_name() 9291e6329e t1507: run commands within test_expect_success 5236fce6b4 t1507: stop losing return codes of git commands 10812c2337 t1501: remove use of `test_might_fail cp` 62d58cda69 t1409: use test_path_is_missing() b87b02cfe6 t1409: let sed open its own input file 9b92070e52 t1307: reorder `nongit test_must_fail` 3595d10c26 t1306: convert `test_might_fail rm` to `rm -f` f511bc02ed t0020: use ! check_packed_refs_marked f6041abdcd t0020: don't use `test_must_fail has_cr` f46c243e66 t0003: don't use `test_must_fail attr_check` 99c049bc4c t0003: use test_must_be_empty() 3738439c77 t0003: use named parameters in attr_check() 7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err() b8afb908c2 t/lib-git-p4: use test_path_is_missing() 4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases 6836d2fe06 dir.c: use st_add3() for allocation size c847dfafee dir: consolidate similar code in treat_directory() 777b420347 dir: synchronize treat_leading_path() and read_directory_recursive() b9670c1f5e dir: fix checks on common prefix directory 5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit 23cbe427c4 Merge branch 'py/console-close-esc' 124a895811 t4015: improve coverage of function context test 509efef789 commit: forbid --pathspec-from-file --all 12029dc57d t3434: mark successful test as such e0f9095aaa notes.h: fix typos in comment 675ef6bab8 t6030: don't create unused file 01ed17dc8c t5580: don't create unused file f670adb49b t3501: don't create unused file 1e1ccbfdd3 git-gui: allow closing console window with Escape 7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays. b02fd2acca The sixth batch 59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex' e3b72391d1 Merge branch 'rs/commit-export-env-simplify' 43bf44e23a Merge branch 'rs/archive-zip-code-cleanup' 4438a1a59f Merge branch 'js/t3404-indent-fix' 3a44db2ed2 Merge branch 'dr/branch-usage-casefix' 8bc481f4f6 Merge branch 'sg/t9300-robustify' 011fc2e88e Merge branch 'js/add-i-a-bit-more-tests' d1c0fe8d9b Merge branch 'dl/range-diff-with-notes' 26c816a67d Merge branch 'hw/doc-in-header' f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 71a7de7a99 Merge branch 'dl/rebase-with-autobase' c9f5fc9114 Merge branch 'dl/test-cleanup' 6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap' 3beff388b2 Merge branch 'js/builtin-add-i-cmds' 4755a34c47 Merge branch 'dd/time-reentrancy' 37c2619d91 Merge branch 'ag/sequencer-todo-updates' 608e380502 git-p4: show detailed help when parsing options fail e2aed5fd5b git-p4: yes/no prompts should sanitize user text 571fb96573 fix-typo: consecutive-word duplications f371984613 Makefile: drop GEN_HDRS 2e4083198d built-in add -p: show helpful hint when nothing can be staged 54d9d9b2ee built-in add -p: only show the applicable parts of the help text ade246efed built-in add -p: implement the 'q' ("quit") command d6cf873340 built-in add -p: implement the '/' ("search regex") command 9254bdfb4f built-in add -p: implement the 'g' ("goto") command bcdd297b78 built-in add -p: implement hunk editing b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf" 11f2c0dae8 built-in add -p: coalesce hunks after splitting them 510aeca199 built-in add -p: implement the hunk splitting feature 0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions 5906d5de77 built-in app -p: allow selecting a mode change as a "hunk" 47dc4fd5eb built-in add -p: handle deleted empty files 80399aec5a built-in add -p: support multi-file diffs 7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed 12c24cf850 built-in add -p: color the prompt and the help text 25ea47af49 built-in add -p: adjust hunk headers as needed e3bd11b4eb built-in add -p: show colored hunks by default 1942ee44e8 built-in add -i: wire up the new C code for the `patch` command f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C d1b1384d61 userdiff: remove empty subexpression from elixir regex df5be01669 doc: indent multi-line items in list fd5041e127 doc: remove non pure ASCII characters 190a65f9db sparse-checkout: respect core.ignoreCase in cone mode 1d7297513d notes: break set_display_notes() into smaller functions 66f79ee23d config/format.txt: clarify behavior of multiple format.notes cc2bd5c45d gitmodules: link to gitsubmodules guide 99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed 8c02fe6060 t7004: don't create unused file cb05d6a5ed t4256: don't create unused file c5c4eddd56 dir: break part of read_directory_recursive() out for reuse 072a231016 dir: exit before wildcard fall-through if there is no wildcard 2f5d3847d4 dir: remove stray quote character in comment a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories" 452efd11fb t3011: demonstrate directory traversal failures ea94b16fb8 git-p4: honor lfs.storage configuration variable 51a0a4ed95 bisect--helper: avoid use-after-free d32e065a91 Merge branch 'kk/branch-name-encoding' ad05a3d8e5 The fifth batch 7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix' b089e5e6cb Merge branch 'em/test-skip-regex-illseq' 930078ba39 Merge branch 'hi/gpg-use-check-signature' 08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode' 7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk' 55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm' 41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress' 5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise' dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix' d37cfe3b5c Merge branch 'dl/pretty-reference' 99c4ff1bda Merge branch 'dl/submodule-set-url' 55d607d85b Merge branch 'js/mingw-inherit-only-std-handles' c58ae96fc4 Merge branch 'am/pathspec-from-file' 7c88714262 Merge branch 'po/bundle-doc-clonable' 5d9324e0f4 Merge branch 'ra/rebase-i-more-options' 7034cd094b Sync with Git 2.24.1 09ac67a183 format-patch: move git_config() before repo_init_revisions() 8164c961e1 format-patch: use --notes behavior for format.notes 452538c358 notes: extract logic into set_display_notes() e6e230eeae notes: create init_display_notes() helper 1e6ed5441a notes: rename to load_display_notes() 2866fd284c name-rev: cleanup name_ref() 49f7a2fde9 name-rev: eliminate recursion in name_rev() fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name' e05e8cf074 archive-zip: use enum for compression method 39acfa3d22 git gui: fix branch name encoding error 11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description 8cf8f9b4aa t3404: fix indentation 4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs 147ee35558 commit: use strbuf_add() to add a length-limited string 559c6fc317 The fourth batch 56e6c16394 Merge branch 'dl/lore-is-the-archive' 3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive' 7cb0d37f6d Merge branch 'tg/perf-remove-stale-result' 403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick' f0cf2fee5d Merge branch 'hi/grep-do-not-return-void' 391fb22ac7 Merge branch 'rs/use-skip-prefix-more' 92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd' 4ba74ca901 Merge branch 'rs/test-cleanup' f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick' ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9' 8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters 3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances dd432a6ecf name-rev: restructure parsing commits and applying date cutoff dd090a8a37 name-rev: pull out deref handling from the recursion 766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev() bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation e0c4da6f2a name-rev: avoid unnecessary cast in name_ref() c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name() c593a26348 t6120-describe: modernize the 'check_describe' helper abcf857300 range-diff: clear `other_arg` at end of function f8675343d7 range-diff: mark pointers as const 828765dfe0 t3206: fix incorrect test name 0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early 21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile b4bbbbd5a2 apply --allow-overlap: fix a corner case 89c8559367 git add -p: use non-zero exit code when the diff generation failed e91162be9c t3701: verify that the diff.algorithm config setting is handled 0c3222c4f3 t3701: verify the shown messages when nothing can be added 24be352d52 t3701: add a test for the different `add -p` prompts 8539b46534 t3701: avoid depending on the TTY prerequisite 0f0fba2cc8 t3701: add a test for advanced split-hunk editing 53a06cf39b Git 2.24.1 67af91c47a Sync with 2.23.1 a7312d1a28 Git 2.23.1 7fd9fd94fb Sync with 2.22.2 d9589d4051 Git 2.22.2 5421ddd8d0 Sync with 2.21.1 367f12b7e9 Git 2.21.1 20c71bcf67 Merge branch 'fix-msys2-quoting-bugs' 7d8b676992 mingw: sh arguments need quoting in more circumstances d9061ed9da t7415: drop v2.20.x-specific work-around 04522edbd4 mingw: fix quoting of empty arguments for `sh` 49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly fc346cb292 Sync with 2.20.2 4cd1cf31ef Git 2.20.2 c154745074 submodule: defend against submodule.update = !command in .gitmodules 4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x d851d94151 Sync with 2.19.3 caccc527ca Git 2.19.3 7c9fbda6e2 Sync with 2.18.2 9877106b01 Git 2.18.2 14af7ed5a9 Sync with 2.17.3 a5ab8d0317 Git 2.17.3 bb92255ebe fsck: reject submodule.update = !command in .gitmodules bdfef0492c Sync with 2.16.6 eb288bc455 Git 2.16.6 68440496c7 test-drop-caches: use `has_dos_drive_prefix()` 9ac92fed5b Sync with 2.15.4 7cdafcaacf Git 2.15.4 e904deb89d submodule: reject submodule.update = !command in .gitmodules d3ac8c3f27 Sync with 2.14.6 66d2a6159f Git 2.14.6 083378cc35 The third batch 88bd37a2d0 Merge branch 'js/pkt-line-h-typofix' 473b431410 Merge branch 'us/unpack-trees-fsmonitor' e0f9ec9027 Merge branch 'sg/test-bool-env' fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset' e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere' 88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory' 8feb47e882 Merge branch 'dl/t5520-cleanup' 6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree' 57d46bc602 Merge branch 'mg/doc-submodule-status-cached' 75bd003c7b Merge branch 'js/git-svn-use-rebase-merges' f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix' c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits' 36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree' cf91c31688 Merge branch 'sg/unpack-progress-throughput' ef6104581d Merge branch 'pb/submodule-update-fetches' 7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix' f3c7bfdde2 Merge branch 'dl/range-diff-with-notes' 9502b616f1 Merge branch 'jh/userdiff-python-async' 76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2' 995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label' f7998d9793 Merge branch 'js/builtin-add-i' 917d0d6234 Merge branch 'js/rebase-r-safer-label' 56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers' 2763530048 Merge branch 'jg/revert-untracked' fa38ab68b0 git-gui: revert untracked files by deleting them d9c6469f38 git-gui: update status bar to track operations 29a9366052 git-gui: consolidate naming conventions 0bb313a552 xdiff: unignore changes in function context 2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names' 65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods' 5532ebdeb7 Merge branch 'fix-mingw-quoting-bug' 76a681ce9c Merge branch 'dubiously-nested-submodules' dd53ea7220 Merge branch 'turn-on-protectntfs-by-default' f82a97eb91 mingw: handle `subst`-ed "DOS drives" 7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams' d2c84dad1c mingw: refuse to access paths with trailing spaces or periods 379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh 817ddd64c2 mingw: refuse to access paths with illegal characters cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors 7530a6287e quote-stress-test: allow skipping some trials 35edce2056 t6130/t9350: prepare for stringent Win32 path validation 55953c77c0 quote-stress-test: accept arguments to test via the command-line ad15592529 tests: add a helper to stress test argument quoting a8dee3ca61 Disallow dubiously-nested submodule git directories 9102f958ee protect_ntfs: turn on NTFS protection by default 91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams 6d8684161e mingw: fix quoting of arguments 3a85dc7d53 is_ntfs_dotgit(): speed it up 7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses 288a74bcd2 is_ntfs_dotgit(): only verify the leading segment a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark cae0bc09ab rebase: fix format.useAutoBase breakage 945dc55dda format-patch: teach --no-base 700e006c5d t4014: use test_config() a749d01e1d format-patch: fix indentation 0c47e06176 t3400: demonstrate failure with format.useAutoBase d9b31db2c4 t7700: stop losing return codes of git commands 3699d69df0 t7700: make references to SHA-1 generic dcf9a748ca t7700: replace egrep with grep cfe5eda02a t7700: consolidate code into test_has_duplicate_object() ae475afc0f t7700: consolidate code into test_no_missing_in_packs() 14b7664df8 doc: replace LKML link with lore.kernel.org d23f9c8e04 RelNotes: replace Gmane with real Message-IDs dcee037228 doc: replace MARC links with lore.kernel.org a9aecc7abb checkout, restore: support the --pathspec-from-file option cfd9376c1d doc: restore: synchronize <pathspec> description 8ea1189eac doc: checkout: synchronize <pathspec> description 6fdc9ad259 doc: checkout: fix broken text reference 1d022bb43f doc: checkout: remove duplicate synopsis bebb5d6d6b add: support the --pathspec-from-file option 21bb3083c3 cmd_add: prepare for next patch 4778452597 Merge branch 'prevent-name-squatting-on-windows' a7b1ad3b05 Merge branch 'jk/fast-import-unsafe' 525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()` e1d911dd4c mingw: disallow backslash characters in tree objects' file names 0060fd1511 clone --recurse-submodules: prevent name squatting on Windows a52ed76142 fast-import: disallow "feature import-marks" by default 68061e3470 fast-import: disallow "feature export-marks" by default 019683025f fast-import: delay creating leading directories for export-marks e075dba372 fast-import: stop creating leading directories for import-marks 11e934d56e fast-import: tighten parsing of boolean command line options 816f806786 t9300: create marks files for double-import-marks test f94804c1f2 t9300: drop some useless uses of cat 4f3e57ef13 submodule--helper: advise on fatal alternate error 10c64a0b3c Doc: explain submodule.alternateErrorStrategy ec48540fe8 packfile.c: speed up loading lots of packfiles 3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value a4fb016ba1 pkt-line: fix a typo 0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data 228f53135a The second batch 6c630f237e Merge branch 'jk/gitweb-anti-xss' 3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell' 4775e02a5c Merge branch 'ma/t7004' a6c6f8d02a Merge branch 'js/complete-svn-recursive' 3ae8defaf9 Merge branch 'jk/send-pack-remote-failure' aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix' 4ab9616c76 Merge branch 'sg/skip-skipped-prereq' 723a8adba5 Merge branch 'ds/test-read-graph' 9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation' 406ca29e0d Merge branch 'rs/parse-options-dup-null-fix' fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging' 8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion' ef8f621045 Merge branch 'dl/complete-rebase-onto' 3c3e5d0ea2 Merge branch 'tg/stash-refresh-index' 43c5fe1c1d Merge branch 'nn/doc-rebase-merges' 6511cb33c9 Merge branch 'dd/sequencer-utf8' f165457618 Merge branch 'jk/remove-sha1-to-hex' a774064fb0 Merge branch 'dj/typofix-merge-strat' ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates' d2489ce92c Merge branch 'rs/skip-iprefix' 376e7309e1 Merge branch 'ln/userdiff-elixir' 9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log' d3096d2ba6 Merge branch 'en/doc-typofix' 26f20fa3fc Merge branch 'ns/test-desc-typofix' ffd130a363 Merge branch 'en/t6024-style' 5149902ff9 Merge branch 'en/misc-doc-fixes' bcb06e204c Merge branch 'js/fetch-multi-lockfix' d08daec001 Merge branch 'rs/trace2-dots' fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix' bad5ed39cd Merge branch 'cb/curl-use-xmalloc' 7ab2088255 Merge branch 'rt/fetch-message-fix' f089ddd56a Merge branch 'es/myfirstcontrib-updates' 3c90710c0c Merge branch 'hw/config-doc-in-header' d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code' 5444d52866 Merge branch 'js/vreportf-wo-buffering' 05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add' ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides' 532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default' dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists' fac9ab1419 Merge branch 'ma/bisect-doc-sample-update' a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix' 0be5caf97c Merge branch 'jc/log-graph-simplify' 0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck' 2e697ced9d built-in add -i: offer the `quit` command d7633578b5 built-in add -i: re-implement the `diff` command 8746e07277 built-in add -i: implement the `patch` command ab1e1cccaf built-in add -i: re-implement `add-untracked` in C c54ef5e424 built-in add -i: re-implement `revert` in C a8c45be939 built-in add -i: implement the `update` command f37c226454 built-in add -i: prepare for multi-selection commands c08171d156 built-in add -i: allow filtering the modified files list 0c3944a628 add-interactive: make sure to release `rev.prune_data` 4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance 867fc7f310 grep: don't return an expression from pcre2_free() c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables 72b006f4bf gpg-interface: prefer check_signature() for GPG verification 7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r ccd469450a date.c: switch to reentrant {gm,local}time_r 271c351b2f t7811: don't create unused file 65efb42862 t9300: don't create unused file f6b9413baf sequencer: fix a memory leak in sequencer_continue() 3eae30e464 doc: replace public-inbox links with lore.kernel.org 46c67492aa doc: recommend lore.kernel.org over public-inbox.org 5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects 17a4ae92ea t7700: s/test -f/test_path_is_file/ d2eee32a89 t7700: move keywords onto their own line 7a1c8c2346 t7700: remove spaces after redirect operators 09279086e8 t7700: drop redirections to /dev/null 756ee7fc9f t7501: stop losing return codes of git commands 38c1aa01de t7501: remove spaces after redirect operators 763b47bafa t5703: stop losing return codes of git commands eacaa1c180 t5703: simplify one-time-sed generation logic a29b2429e5 t5317: use ! grep to check for no matching lines 6c37f3ec1b t5317: stop losing return codes of git commands b66e0a1773 t4138: stop losing return codes of git commands afd43c9905 t4015: use test_write_lines() 946d2353a3 t4015: stop losing return codes of git commands 50cd31c652 t3600: comment on inducing SIGPIPE in `git rm` 3b737381d8 t3600: stop losing return codes of git commands 0d913dfa7e t3600: use test_line_count() where possible 29a40b5a67 t3301: stop losing return codes of git commands 9b5a9fa60a t0090: stop losing return codes of git commands 17aa9d9c1a t0014: remove git command upstream of pipe 77a946be98 apply-one-time-sed.sh: modernize style 176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job ed254710ee test: use test_must_be_empty F instead of test_cmp empty F c74b3cbb83 t7812: add missing redirects 213dabf49d test: use test_must_be_empty F instead of test -z $(cat F) c93a5aaec8 t1400: use test_must_be_empty 6e4826ea75 t1410: use test_line_count a5d04a3ef9 t1512: use test_line_count 54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd() 2059e79c0d name-rev: use skip_prefix() instead of starts_with() 1768aaf01d push: use skip_prefix() instead of starts_with() ec6ee0c07a shell: use skip_prefix() instead of starts_with() 7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with() a6293f5d28 fetch: use skip_prefix() instead of starts_with() 13ca8fb79e t5150: skip request-pull test if Perl is disabled ecc0869080 commit-graph: use start_delayed_progress() 44a4693bfc progress: create GIT_PROGRESS_DELAY 528d9e6d01 t/perf: don't depend on Git.pm b8dcc45387 perf-lib: use a single filename for all measurement types fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk' d82dfa7f5b rebase -i: finishing touches to --reset-author-date 1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory 393adf7a6f sequencer: directly call pick_commits() from complete_action() a2dd67f105 rebase: fill `squash_onto' in get_replay_opts() 3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function 34065541e3 sequencer: update `done_nr' when skipping commands in a todo list 8638114e06 sequencer: update `total_nr' when adding an item to a todo list 0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions 9917eca794 l10n: zh_TW: add translation for v2.24.0 0a8e3036a3 reset: parse rev as tree-ish in patch mode f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits 8d483c8408 doc: document 'git submodule status --cached' befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later 9a780a384d mingw: spawned processes need to inherit only standard handles c5a03b1e29 mingw: work around incorrect standard handles eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool 43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values 2d05ef2778 sequencer: fix empty commit check when amending ea8b7be147 git svn: stop using `rebase --preserve-merges` 67a6ea6300 gpg-interface: limit search for primary key fingerprint 392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern cff4e9138d sparse-checkout: check for dirty status 416adc8711 sparse-checkout: update working directory in-process for 'init' f75a69f880 sparse-checkout: cone mode should not interact with .gitignore fb10ca5b54 sparse-checkout: write using lockfile 99dfa6f970 sparse-checkout: use in-process update for disable subcommand e091228e17 sparse-checkout: update working directory in-process e9de487aa3 sparse-checkout: sanitize for nested folders 4dcd4def3c unpack-trees: add progress to clear_ce_flags() eb42feca97 unpack-trees: hash less in cone mode af09ce24a9 sparse-checkout: init and set in cone mode 96cc8ab531 sparse-checkout: use hashmaps for cone patterns 879321eb0b sparse-checkout: add 'cone' mode e6152e35ff trace2: add region in clear_ce_flags 72918c1ad9 sparse-checkout: create 'disable' subcommand 7bffca95ea sparse-checkout: add '--stdin' option to set subcommand f6039a9423 sparse-checkout: 'set' subcommand d89f09c828 clone: add --sparse mode bab3c35908 sparse-checkout: create 'init' subcommand 94c0956b60 sparse-checkout: create builtin with 'list' subcommand 679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files df6d3d6802 lib-bash.sh: move `then` onto its own line 2a02262078 t5520: replace `! git` with `test_must_fail git` c245e58bb6 t5520: remove redundant lines in test cases a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp e959a18ee7 t5520: don't put git in upstream of pipe 5540ed27bc t5520: test single-line files by git with test_cmp dd0f1e767b t5520: use test_cmp_rev where possible 979f8891cc t5520: replace test -{n,z} with test-lib functions 3037d3db90 t5520: use test_line_count where possible 93a9bf876b t5520: remove spaces after redirect operator ceeef863de t5520: replace test -f with test-lib functions 4c8b046f82 t5520: let sed open its own input 53c62b9810 t5520: use sq for test case names e8d1eaf9b4 t5520: improve test style 2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals 8cb7980382 t0000: test multiple local assignment 5b583e6a09 format-patch: pass notes configuration to range-diff bd36191886 range-diff: pass through --notes to `git log` 9f726e1b87 range-diff: output `## Notes ##` header 3bdbdfb7a5 t3206: range-diff compares logs with commit notes 75c5aa0701 t3206: s/expected/expect/ 79f3950d02 t3206: disable parameter substitution in heredoc 3a6e48e9f7 t3206: remove spaces after redirect operators 26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish 077a1fda82 userdiff: support Python async functions 3798149a74 SubmittingPatches: use `--pretty=reference` 1f0fc1db85 pretty: implement 'reference' format 618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type 0df621172d pretty: provide short date format ac52d9410e t4205: cover `git log --reflog -z` blindspot 3e8ed3b93e pretty.c: inline initalize format_context 4982516451 revision: make get_revision_mark() return const pointer f0f9de2bd7 completion: complete `tformat:` pretty format fb2ffa77a6 SubmittingPatches: remove dq from commit reference bae74c9dfb pretty-formats.txt: use generic terms for hash bd00717eab SubmittingPatches: use generic terms for hash 9d45ac4cbf rev-list-options.txt: remove reference to --show-notes 828e829b9e argv-array: add space after `while` e440fc5888 commit: support the --pathspec-from-file option 66a25a7242 doc: commit: synchronize <pathspec> description 64bac8df97 reset: support the `--pathspec-from-file` option d137b50756 doc: reset: synchronize <pathspec> description 24e4750c96 pathspec: add new function to parse file 0dbc4a0edf ci(osx): update homebrew-cask repository with less noise e02058a729 sequencer: handle rebase-merges for "onto" message bae60ba7e9 builtin/unpack-objects.c: show throughput progress 2d92ab32fd rev-parse: make --show-toplevel without a worktree an error 9e5afdf997 fetch: add trace2 instrumentation 4c4066d95d run-command: move doc to run-command.h 6c51cb525d trace2: move doc to trace2.h 7db0305438 parse-options: add link to doc file in parse-options.h d95a77d059 submodule-config: move doc to submodule-config.h f3b9055624 credential: move doc to credential.h bbcfa3002a tree-walk: move doc to tree-walk.h 971b1f24a2 argv-array: move doc to argv-array.h f1ecbe0f53 trace: move doc to trace.h 13aa9c8b70 cache: move doc to cache.h c0be43f898 sigchain: move doc to sigchain.h 19ef3ddd36 pathspec: move doc to pathspec.h 301d595e72 revision: move doc to revision.h 3a1b3415d9 attr: move doc to attr.h 126c1ccefb refs: move doc to refs.h d27eb356bf remote: move doc to remote.h and refspec.h 405c6b1fbc sha1-array: move doc to sha1-array.h d3d7172e40 merge: move doc to ll-merge.h 3f1480b745 graph: move doc to graph.h and graph.c 266f03eccd dir: move doc to dir.h 13c4d7eb22 diff: move doc to diff.h and diffcore.h cd5522271f rebase -r: let `label` generate safer labels 867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()` 8c15904462 built-in add -i: implement the `help` command 3d965c7674 built-in add -i: use color in the main loop 68db1cbf8e built-in add -i: support `?` (prompt help) 76b743234c built-in add -i: show unique prefixes of the commands 6348bfba58 built-in add -i: implement the main loop a376e37b2c gitweb: escape URLs generated by href() b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI f28bceca75 t/gitweb-lib.sh: drop confusing quotes 0eba60c9b7 t9502: pass along all arguments in xss helper 932757b0cc INSTALL: use existing shell scripts as example b018719927 t7004: check existence of correct tag 1daaebcaa5 built-in add -i: color the header in the `status` command 5e82b9e4d2 built-in add -i: implement the `status` command e4cb659ebd diff: export diffstat interface f83dff60a7 Start to implement a built-in version of `git add --interactive` df53c80822 stash: make sure we have a valid index before writing it ad7a403268 send-pack: check remote ref status on pack-objects failure d91ce887c9 t6120-describe: correct test repo history graph in comment 1f9247a3bd completion: tab-complete "git svn --recursive" 603960b50e promisor-remote: remove fetch_if_missing=0 e362fadcd0 clone: remove fetch_if_missing=0 169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL 51bd6be32d mingw: use COPY_ARRAY for copying array 4bd0593e0f test-tool: use 'read-graph' helper e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway d784d978f6 t4215: use helper function to check output 61eea521fe fsmonitor: do not compare bitmap size with size of split index b19f3fe9dd hex: drop sha1_to_hex() c1ce9c06d0 completion: learn to complete `git rebase --onto=` f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase aa6d7f93ed hex: drop sha1_to_hex_r() 52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch 5772b0c745 sequencer: reencode old merge-commit message e0eba649e8 bundle-verify: add --quiet 79862b6b77 bundle-create: progress output control 73c3253d75 bundle: framework for options before bundle file 68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in" b375744274 sequencer: reencode squashing commit's message 019a9d8362 sequencer: reencode revert/cherry-pick's todo list 0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding 1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary d9f6f3b619 The first batch post 2.24 cycle 28014c1084 Merge branch 'bc/hash-independent-tests-part-6' 57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree' c22f63c40f Merge branch 'pb/pretty-email-without-domain-part' 5731ca3657 Merge branch 'hw/remove-api-docs-placeholder' 14b58c62bc Merge branch 'sg/commit-graph-usage-fix' eff313f8a7 Merge branch 'dl/apply-3way-diff3' db806d7064 Merge branch 'sg/dir-trie-fixes' f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix' 8f1119b988 Merge branch 'wb/midx-progress' d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes' 0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges' 8f40d89783 Merge branch 'hv/bitshift-constants-in-blame' d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head' 5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer' b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc' 15d9f3dc66 Merge branch 'es/walken-tutorial' 026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor' ed28358833 convert: use skip_iprefix() in validate_encoding() 89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding() 03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules ae821ffe83 multimail: fix a few simple spelling errors 557c5895c2 sha1dc: fix trivial comment spelling error aa74be316a Fix spelling errors in test commands 96c0caf5e3 Fix spelling errors in messages shown to users 4dc8b1c114 Fix spelling errors in names of tests 7a40cf1553 Fix spelling errors in comments of testcases 15beaaa3d1 Fix spelling errors in code comments a807200f67 userdiff: add Elixir to supported userdiff languages 461caf3e8a git-shortlog.txt: include commit limiting options 6462d5eb9a fetch: remove fetch_if_missing=0 46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion 99b2ba35f5 t0028: eliminate non-standard usage of printf add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` 14c4776d75 t: fix typo in test descriptions 270de6acbe t6024: modernize style 77363a51fb name-hash.c: remove duplicate word in comment c92faa4d22 hashmap: fix documentation misuses of -> versus . a6d39f2efb git-filter-branch.txt: correct argument name typo 4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators 8915297925 Fix spelling errors in documentation outside of Documentation/ 031fd4b93b Documentation: fix a bunch of typos, both old and new dd0b61f577 fsmonitor: fix watchman integration 5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare() 7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph c14e6e7903 fetch: add the command-line option `--write-commit-graph` da72936f54 Git 2.24 1d34d425d4 Merge branch 'bc/doc-use-docbook-5' dac1d83c91 Merge branch 'ds/commit-graph-on-fetch' c32ca691c2 Merge branch 'jt/delay-fetch-if-missing' ab6b50e4c8 Merge https://github.com/prati0100/git-gui 93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2 fe28ad8520 rebase: add --reset-author-date 08187b4cba rebase -i: support --ignore-date 0185c683c9 sequencer: rename amend_author to author_to_rename cbd8db17ac rebase -i: support --committer-date-is-author-date c068bcc59b sequencer: allow callers of read_author_script() to ignore fields ba51d2fb24 rebase -i: add --ignore-whitespace flag 3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower 3ada78de3f myfirstcontrib: add dependency installation step 4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt 4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly 8dfb04ae96 update-index: optionally leave skip-worktree entries alone 116d1fa6c6 vreportf(): avoid relying on stdio buffering efd5444238 RelNotes/2.24.0: fix self-contradictory note 391c7e40b5 fetch.c: fix typo in a warning message 55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template 849e43680d RelNotes/2.24.0: typofix 0115e5d929 git-diff.txt: document return code of `--no-index` 798d66e35d l10n: de.po: Update German translation c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u) f21f8f5d35 Git 2.24-rc2 8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix' 0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix' f2db52c46b Merge branch 'js/mingw-needs-hiding-fix' 5b7594abdc Merge branch 'master' of github.com:vnwildman/git 034d33653a Merge branch 'next' of github.com:ChrisADR/git-po 26b061007c submodule: teach set-url subcommand 460782b7be t7519-status-fsmonitor: improve comments d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses 4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config 1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694) f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0 762d5b4f46 help: add gitsubmodules to the list of guides 76a53d640f git_path(): handle `.lock` files correctly 3ce47211a6 t1400: wrap setup code in test case 44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string 6c02042139 clone: rename static function `dir_exists()`. 8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command 77200e9332 l10n: es: 2.24.0 round 2 e42df36b42 Merge branch 'l10n/it/update-italian-translation' 5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2 51728480fe l10n: fr v2.24.0 rnd2 045a548698 l10n: git.pot: v2.24.0 round 2 (1 new) 468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree() c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit() 103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag() f648ee7088 fsck: rename vague "oid" local variables cc579000bf fsck: don't require an object struct in verify_headers() 7854399366 fsck: don't require an object struct for fsck_ident() b8b00f1693 fsck: drop blob struct from fsck_finish() 6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob() 38370253fd fsck: don't require an object struct for report() f59793763d fsck: only require an oid for skiplist functions 5afc4b1dc6 fsck: only provide oid/type in fsck_error callback 82ef89b318 fsck: don't require object structs for display functions 733902905d fsck: use oids rather than objects for object_name API d40bbc109b fsck_describe_object(): build on our get_object_name() primitive a59cfb3230 fsck: unify object-name code 23a173a761 fsck: require an actual buffer for non-blobs 2175a0c601 fsck: stop checking tag->tagged ec65231571 fsck: stop checking commit->parent counts 1de6007d85 fsck: stop checking commit->tree value 228c78fbd4 commit, tag: don't set parsed bit for parse failures 60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()` 8b656572ca builtin/commit-graph.c: remove subcommand-less usage string fa26d5ede6 t4048: abstract away SHA-1-specific constants cf02be8486 t4045: make hash-size independent 38ee26b2a3 t4044: update test to work with SHA-256 37ab8ebef1 t4039: abstract away SHA-1-specific constants 0370b35414 t4038: abstract away SHA-1 specific constants 0253e126a2 t4034: abstract away SHA-1-specific constants 45e2ef2b1d t4027: make hash-size independent 79b0edc1a0 t4015: abstract away SHA-1-specific constants 840624ff55 t4011: abstract away SHA-1-specific constants 32a6707267 t4010: abstract away SHA-1-specific constants 440bf91dfa t3429: remove SHA1 annotation 0b408ca2bd t1305: avoid comparing extensions 2eabd38313 rev-parse: add a --show-object-format option 52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode 45e206f0d8 t4203: use test-lib.sh definitions 2ae4944aac t6006: use test-lib.sh definitions cb99a34e23 commit-graph: fix writing first commit-graph during fetch e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug 7b4fb434b4 documentation: remove empty doc files 566a1439f6 Git 2.24-rc1 04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix' 4d6fb2beeb Merge branch 'ds/feature-macros' 5f0b6ed907 Merge branch 'js/azure-ci-osx-fix' c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs' 1b4f85285f Merge branch 'dl/submodule-set-branch' c7aadccba0 fetch: delay fetch_if_missing=0 until after config c11e9966cb repo-settings: read an int for index.version 091489d068 apply: respect merge.conflictStyle in --3way aa76ae4905 t4108: demonstrate bug in apply 95806205cd t4108: use `test_config` instead of `git config` b0069684d4 t4108: remove git command upstream of pipe fa87b81385 t4108: replace create_file with test_write_lines 7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job 6c96630cb0 config: move documentation to config.h d81542e6f3 Eleventh batch e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix' d45d771978 Merge branch 'bc/smart-http-atomic-push' 22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix' 2e215b7959 Merge branch 'sb/userdiff-dts' e3cf08361a Merge branch 'sg/progress-fix' b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix' c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc' f45f88b2e4 path.c: don't call the match function without value in trie_find() c72fc40d09 path.c: clarify two field names in 'struct common_dir' 8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file 7cb8c929d7 path.c: clarify trie_find()'s in-code comment e536b1fedf Documentation: mention more worktree-specific exceptions 680cba2c2b multi-pack-index: add [--[no-]progress] option. 64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file 8dc18f8937 midx: add progress to expire_midx_packs 840cef0c70 midx: add progress to write_midx_file efbc3aee08 midx: add MIDX_PROGRESS flag 0eb3671ed9 ci(osx): use new location of the `perforce` cask da1e295e00 t604[236]: do not run setup in separate tests 49b8133a9e merge-recursive: fix merging a subdirectory into the root directory d3eebaad5e merge-recursive: clean up get_renamed_dir_portion() 80736d7c5e doc: am --show-current-patch gives an entire e-mail message a8e2c0eadc t7419: change test_must_fail to ! for grep 19c29e538e t4014: make output-directory tests self-contained 12a4aeaad8 Merge branch 'js/azure-pipelines-msvc' 399c23c046 ci(visual-studio): actually run the tests in parallel 711cd6d15c ci(visual-studio): use strict compile flags, and optimization 370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0 cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master 907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master 13bcea8c7f l10n: fr 2.24.0 rnd 1 135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master 3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) 8da56a4848 userdiff: fix some corner cases in dts regex 86795774bb builtin/blame.c: constants into bit shift format feebd2d256 rebase: hide --preserve-merges option 0e40a73a4c Doc: Bundle file usage 78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error 12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error 2b6f6ea1bd test-progress: fix test failures on big-endian systems f757409e36 l10n: bg.po: Updated Bulgarian translation (4693) 176f5adfdb completion: clarify installation instruction for zsh d966095db0 Git 2.24-rc0 90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array' 3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth' d0258d0944 Merge branch 'rs/http-push-simplify' bb52def6da Merge branch 'jj/stash-reset-only-toplevel' f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs' e5fca6b573 Merge branch 'bb/compat-util-comment-fix' 43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup' 07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely' 2d74d28ee0 Merge branch 'dl/compat-cleanup' 9b83a94829 Merge branch 'ta/t1308-typofix' 376012c919 Merge branch 'js/doc-stash-save' 10da030ab7 grep: avoid leak of chartables in PCRE2 513f2b0bbd grep: make PCRE2 aware of custom allocator 57d4660468 grep: make PCRE1 aware of custom allocator d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand 8af69cf3e2 t3301: test diagnose messages for too few/many paramters 6f1194246a remote-curl: pass on atomic capability to remote side bbb13e8188 graph: fix coloring of octopus dashes 92beecc136 graph: flatten edges that fuse with their right neighbor 479db18bc0 graph: smooth appearance of collapsing edges on commit lines 0195285b95 graph: rename `new_mapping` to `old_mapping` d62893ecc1 graph: commit and post-merge lines for left-skewed merges 0f0f389f12 graph: tidy up display of left-skewed merges 458152cce1 graph: example of graph output that can be simplified ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state 46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()` a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()` 9157a2a032 graph: reuse `find_new_column_by_commit()` 210179a20d graph: handle line padding in `graph_next_line()` fbccf255f9 graph: automatically track display width of graph lines 5374a290aa fetch-pack: write fetched refs to .promisor 4627bc777e sequencer: run post-commit hook 49697cb721 move run_commit_hook() to libgit and use it there 12bb7a540a sequencer.h fix placement of #endif 6a619ca03c t3404: remove uneeded calls to set_fake_editor b2dbacbddf t3404: set $EDITOR in subshell 88a92b6c73 t3404: remove unnecessary subshell bf8e65b30b format-patch: teach --cover-from-description option a92331df18 format-patch: use enum variables 46273df7bf format-patch: replace erroneous and condition 3b3c79f6c9 diff-highlight: fix a whitespace nit 108b97dc37 Ninth batch cbe8cdd3a0 Merge branch 'jk/coc' 3b9ec27919 Merge branch 'js/trace2-fetch-push' c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch' 1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup' eb3de5b823 Merge branch 'js/xdiffi-comment-updates' 4e8371ec26 Merge branch 'dl/t0000-skip-test-test' b6d712fa4e Merge branch 'tg/range-diff-output-update' 77458870a5 Merge branch 'gs/sq-quote-buf-pretty' 5efabc7ed9 Merge branch 'ew/hashmap' d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files' 6ed610b968 Merge branch 'am/t0028-utf16-tests' 5b900fb812 Merge branch 'dl/octopus-graph-bug' 16d9d7184b Merge branch 'en/fast-imexport-nested-tags' 6d5291be45 Merge branch 'js/azure-pipelines-msvc' ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd' d96e31e390 Merge branch 'js/fetch-jobs' 280bd44551 Merge branch 'en/merge-recursive-cleanup' 062a309d36 remote-curl: use argv_array in parse_push() a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes 5cc6a4be11 http-push: simplify deleting a list item 556895d0c8 stash: avoid recursive hard reset on submodules b524f6b399 Merge branch 'ka/japanese-translation' f6f3824b4e git-gui: improve Japanese translation 61f4b407d3 Merge branch 'py/readme' 1e6880fd06 git-gui: add a readme edefc31873 format-patch: create leading components of output directory 68b69211b2 git-compat-util: fix documentation syntax fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth() e0479fa073 documentation: add tutorial for object walking 3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed 4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target 9cad1c4488 pthread.h: manually align parameter lists 8c1cfd58e3 t1308-config-set: fix a test that has a typo 57d8f4b4c7 doc(stash): clarify the description of `save` 08da6496b6 Eighth batch 07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup' f0d407e6ae Merge branch 'kt/add-i-progress' 66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree' a4c5d9f66e Merge branch 'rs/dedup-includes' 159cdabd87 Merge branch 'js/range-diff-noprefix' 93424f1f7d Merge branch 'cb/pcre1-cleanup' a73f91774c Merge branch 'ab/pcre-jit-fixes' 4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword' 020011f2cb Merge branch 'tk/git-svn-trim-author-name' 676278f8ea Merge branch 'bc/object-id-part17' aafb75452b Merge branch 'en/clean-nested-with-ignored' 3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails 5cdf2301d4 add a Code of Conduct document 70bf0b755a Seventh batch 9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat' 2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary' d17f54947d Merge branch 'rs/convert-fix-utf-without-dash' 82c80f98e6 Merge branch 'py/git-gui-has-maintainer' 6e12570822 Merge branch 'ah/cleanups' 772cad0afb Merge branch 'js/diff-rename-force-stable-sort' 424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path' 678a9ca629 Merge branch 'as/shallow-slab-use-fix' 0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix' 042a54d251 Merge branch 'am/visual-studio-config-fix' 03d3b1297c xdiffi: fix typos and touch up comments b05b40930e t0000: cover GIT_SKIP_TESTS blindspots d8bc1a518a send-pack: never fetch when checking exclusions 756fb0dedb t4014: treat rev-list output as the expected value 2b6a9b13ca range-diff: don't segfault with mode-only changes 360c7ba330 transport: push codepath can take arbitrary repository ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments b657047719 merge-recursive: fix the fix to the diff3 common ancestor label b744c3af07 Sixth batch 417056578a Merge branch 'bw/submodule-helper-usage-fix' 9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check' 1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a' 59b19bcd9f Merge branch 'cc/multi-promisor' 1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' 5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort' eb35c18e42 Merge branch 'sg/travis-help-debug' cabb145fe3 Merge branch 'rs/alias-use-copy-array' 56c7ab0f4e Merge branch 'sg/t-helper-gitignore' e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang' 583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules' 337e3f2b49 Merge branch 'rs/nth-switch-code-simplification' 8f53fe1733 Merge branch 'hb/hg-to-git-py3' ef93bfbd45 Merge branch 'sg/progress-fix' 980351d1ac Merge branch 'js/doc-patch-text' 80693e3f09 Merge branch 'tb/commit-graph-harden' ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge' 3f84633563 Merge branch 'dl/cocci-everywhere' caf150ce7d Merge branch 'gs/commit-graph-progress' 1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim' 1398171378 Merge branch 'rs/commit-graph-use-list-count' 773521df26 Merge branch 'rs/nth-parent-parse' 7f17913161 Merge branch 'dl/submodule-set-branch' cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix' bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees' 098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack' 37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc' e392382f95 Merge branch 'dl/complete-rebase-and-archive' cda8faa37e Merge branch 'jk/commit-graph-cleanup' 36d2fca82b Merge branch 'ss/get-time-cleanup' ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude' ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob' ba2d451122 Merge branch 'tg/stash-refresh-index' e2b5038d87 hashmap_entry: remove first member requirement from docs 404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry 23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators c8e424c9c9 hashmap: introduce hashmap_free_entries 8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry * 87571c3f71 hashmap: use *_entry APIs for iteration 939af16eac hashmap_cmp_fn takes hashmap_entry params f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *" f0e63c4113 hashmap: use *_entry APIs to wrap container_of 6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *" 973d5eea74 introduce container_of macro 26b455f21e hashmap_put takes "struct hashmap_entry *" 28ee794128 hashmap_remove takes "const struct hashmap_entry *" b6c5241606 hashmap_get takes "const struct hashmap_entry *" b94e5c1df6 hashmap_add takes "struct hashmap_entry *" f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *" d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *" d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry 12878c8351 coccicheck: detect hashmap_entry.hash assignment e010a41216 diff: use hashmap_entry_init on moved_entry.ent f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo" de5abb5f7a git-p4: auto-delete named temporary file c90b652afd Fifth batch f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1' b0f8aed48f Merge branch 'ma/user-manual-markup-update' faf5576a8d Merge branch 'bc/doc-use-docbook-5' 314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes' 70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo' 847650798b Merge branch 'am/mailmap-andrey-mazo' 1a155f2e66 Merge branch 'jc/git-gui-has-maintainer' 1bcef51204 t/oid-info: add empty tree and empty blob values ecde49bb8a t/oid-info: allow looking up hash algorithm name 11a3d3aadd git-rev-list.txt: prune options in synopsis 7d2f003ee4 Documentation: update the location of the git-gui repo b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding() 46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines b35304bf95 ci: really use shallow clones on Azure Pipelines ab7d854aba tests: let --immediate and --write-junit-xml play well together be5d88e112 test-tool run-command: learn to run (parts of) the testsuite 5d65ad17a9 vcxproj: include more generated files 030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built 61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable() e4347c9434 msvc: handle DEVELOPER=1 ed712ef8d5 msvc: ignore some libraries when linking 5b8f9e2417 compat/win32/path-utils.h: add #include guards 41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning c097b95a26 msvc: avoid using minus operator on unsigned types dfd557c978 stash apply: report status correctly even in a worktree's subdirectory d54dea77db fetch: let --jobs=<n> parallelize --multiple, too 87db61a436 trace2: write discard message to sentinel files 83e57b04e6 trace2: discard new traces if target directory has too many files 11c21f22de t4214: demonstrate octopus graph coloring failure 25eb905e14 t4214: explicitly list tags in log 63be8c8dd7 t4214: generate expect in their own test cases a7a5590c6e t4214: use test_merge 94ba151300 test-lib: let test_merge() perform octopus merges 22541013d0 docs: clarify trace2 version invariants 3d4548e7e2 docs: mention trace2 target-dir mode in git-config 2fe44394c8 treewide: remove duplicate #include directives dbcd970c27 push: do not pretend to return `int` from `die_push_simple()` 941790d7de fast-export: handle nested tags 8d7d33c1ce t9350: add tests for tags of things other than a commit a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags 208d69246e fast-export: add support for --import-marks-if-exists b8f50e5b60 fast-import: add support for new 'alias' command f73b2aba05 fast-import: allow tags to be identified by mark labels 3164e6bd24 fast-import: fix handling of deleted tags 8085050ab4 add -i: show progress counter in the prompt 69fdb922ad Merge branch 'bw/diff3-conflict-style' b436825b9b git-gui: support for diff3 conflict style 937b76ed49 range-diff: internally force `diff.noprefix=true` 411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job 25e4b8099c push: add trace2 instrumentation 5fc31180d8 fetch: add trace2 instrumentation 53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value c3b57dc2a0 git-gui: use existing interface to query a path's attribute 45ab460d4a Merge branch 'js/git-bash-if-available' 0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command 71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only) 54a80a9ad8 wrapper: use a loop instead of repetitive statements baed6bbb5b diffcore-break: use a goto instead of a redundant if statement 8da02ce62a commit-graph: remove a duplicate assignment ddb3c856f3 shallow.c: don't free unallocated slabs 8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits 65904b8b2b promisor-remote: skip move_to_tail when no-op 2049b8dc65 diffcore_rename(): use a stable sort 97fff61012 Move git_sort(), a stable sort, into into libgit.a 69f272b922 dir: special case check for the possibility that pathspec is NULL 6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available bc12974a89 Fourth batch 5a5350940b Merge branch 'ds/commit-graph-on-fetch' 974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch' 9755f70fe6 Merge branch 'ds/include-exclude' 93fc8760e7 Merge branch 'jh/trace2-pretty-output' 640f9cd599 Merge branch 'dl/rebase-i-keep-base' 026428c35e Merge branch 'sg/clean-nested-repo-with-ignored' 21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip' d693345518 Merge branch 'dl/use-sq-from-test-lib' d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes' 2be6ccc01a Merge branch 'sg/git-test-boolean' cf861cd7a0 Merge branch 'rs/get-tagged-oid' 91243b019d Merge branch 'en/filter-branch-deprecation' 9bc67b6658 Merge branch 'en/merge-options-ff-and-friends' fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden' cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option' 8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return' 3ff6af7753 Merge branch 'nd/switch-and-restore' aadac067aa Merge branch 'tb/file-url-to-unc-path' b57a88a5f1 Merge branch 'js/gitdir-at-unc-root' 6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path' 430439536b Merge branch 'rs/parse-tree-indirect' 991fd97b9a Merge branch 'jk/fast-import-history-bugfix' 74a39b9bcc Merge branch 'mh/notes-duplicate-entries' 37801f0665 Merge branch 'tb/banned-vsprintf-namefix' 21ce0b48f3 Merge branch 'mh/release-commit-memory-fix' f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup' bf6136cab8 Merge branch 'rs/strbuf-detach' a2e22bb3ad Merge branch 'rs/trace2-dst-warning' 1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup' 0281733483 Merge branch 'bc/hash-independent-tests-part-5' f06fb376ed Merge branch 'jc/test-cleanup' 00bb74453d Merge branch 'dl/compat-cleanup' 59438be06c Merge branch 'js/visual-studio' cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone' af2abd870b fast-export: fix exporting a tag and nothing else c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit fd5b820d9c user-manual.txt: change header notation e79b34533a user-manual.txt: add missing section label b503a2d515 Makefile: emulate compile in $(HCO) target better af26e2a9d2 pack-bitmap.h: remove magic number b06fdead04 promisor-remote.h: include missing header 97b989ee3a apply.h: include missing header 4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name d928a8388a t0028: add more tests 0b63fd6965 t0028: fix test for UTF-16-LE-BOM fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration 2e09c01232 name-rev: avoid cutoff timestamp underflow 8464f94aeb promisor-remote.h: drop extern from function declaration 75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp 24c681794f doc: MyFirstContribution: fix cmd placement instructions c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode 60c60b627e Merge branch 'py/git-git-extra-stuff' faf420e05a treewide: correct several "up-to-date" to "up to date" b71c6c3b64 Fix build with core.autocrlf=true 16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff 26e3d1cbea .mailmap: update email address of Andrey Mazo 27ea41c0b4 t/helper: ignore only executable files 7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias() 83e3ad3b12 merge-recursive: symlink's descendants not in way 34933d0eff stash: make sure to write refreshed cache e080b34540 merge: use refresh_and_write_cache 22184497a3 factor out refresh_and_write_cache function 7371612255 commit-graph: add --[no-]progress to write and verify 47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW 253bfe49bd SubmittingPatches: git-gui has a new maintainer d17ae00c97 hg-to-git: make it compatible with both python3 and python2 4c86140027 Third batch f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http' 627b826834 Merge branch 'md/list-objects-filter-combo' b9ac6c59b8 Merge branch 'cc/multi-promisor' de67293e74 Merge branch 'sg/line-log-tree-diff-optim' 95486229e3 Merge branch 'sg/complete-configuration-variables' f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook' a2e524ecf3 Merge branch 'cb/curl-use-xmalloc' 128666753b Merge branch 'jk/drop-release-pack-memory' 917a319ea5 Merge branch 'js/rebase-r-strategy' 7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui 4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout() 0d4304c124 doc: fix reference to --ignore-submodules af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py 8a3a6817e2 Merge gitk to pick up emergency build fix 2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po 9027af58e2 Makefile: run coccicheck on more source files 43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES) 5dedf7de53 Makefile: define THIRD_PARTY_SOURCES 902b90cf42 clean: fix theoretical path corruption ca8b5390db clean: rewrap overly long line 09487f2cba clean: avoid removing untracked files in a nested git repository e86bbcf987 clean: disambiguate the definition of -d 3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run 29b577b960 dir: add commentary explaining match_pathspec_item's return value 89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case 404ebceda0 dir: also check directories for matching pathspecs a5e916c745 dir: fix off-by-one error in match_pathspec_item bbbb6b0b89 dir: fix typo in comment 7541cc5302 t7300: add testcases showing failure to clean specified pathspecs 0eb7c37a8a diff, log doc: small grammer, format, and language fixes 6fae6bd518 diff, log doc: say "patch text" instead of "patches" 2bb74b53a4 Test the progress display bbf47568ad Revert "progress: use term_clear_line()" cf6a2d2557 Makefile: strip leading ./ in $(LIB_H) b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup 689a146c91 commit-graph: use commit_list_count() 59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N" a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N" a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base" cf34337f98 list-objects-filter: give a more specific error sparse parsing error 4c96a77594 list-objects-filter: delay parsing of sparse oid 72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter 83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer 7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>` 226daba280 Doc/Makefile: give mansource/-version/-manual attributes 40e747e89d git-submodule.txt: fix AsciiDoc formatting error f6461b82b9 Documentation: fix build with Asciidoctor 2 3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk f7a8834ba4 Merge branch 'bp/amend-toggle-bind' ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit" 9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog beffae768a gitk: Add Chinese (zh_CN) translation 56d9cbe68b packfile: expose get_delta_base() bab28d9f97 builtin/pack-objects: report reused packfile objects 6c8ec8c30a Merge branch 'bw/commit-scrollbuffer' acfa495519 Merge branch 'bw/amend-checkbutton' da08d559b7 git-gui: add horizontal scrollbar to commit buffer ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton aeeb978ba6 completion: teach archive to use __gitcomp_builtin 2b9bd488ae completion: teach rebase to use __gitcomp_builtin d49dffde9a completion: add missing completions for log, diff, show 6abada1880 upload-pack: disable commit graph more gently for shallow traversal fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time 72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set 4fd39c76e6 doc: minor formatting fix 29f4332e66 Quit passing 'now' to date code c77abf0460 Merge branch 'py/revert-hunks-lines' 5a2bb62180 Merge branch 'bp/widget-focus-hotkeys' e07446ed5f git-gui: add hotkeys to set widget focus f981ec18cf cache-tree: do not lazy-fetch tentative tree f1d4a28250 Second batch c8ada15456 Merge branch 'bc/reread-attributes-during-rebase' 8f3ba423e7 Merge branch 'tg/t0021-racefix' a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email' d49c2c3466 Merge branch 'sb/userdiff-dts' 2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe' 4c49dd042d Merge branch 'nd/diff-parseopt' d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix' 8ce8a63b46 Merge branch 'ds/midx-expire-repack' 9437394661 Merge branch 'cb/fetch-set-upstream' af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix' fa9e7934c7 Merge branch 'bm/repository-layout-typofix' d1a251a1fa Merge branch 'en/checkout-mismerge-fix' e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental' f4f8dfe127 Merge branch 'ds/feature-macros' 4a12f89865 Merge branch 'jk/eoo' b4a1eec332 Merge branch 'jk/repo-init-cleanup' 70336bd50a Merge branch 'py/git-gui-do-quit' ad7c543e3b grep: skip UTF8 checks explicitly 0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration() b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration 4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor b7e1ba5649 git-merge-index.txt: wrap shell listing in "----" 38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----" 5371813768 git-ls-remote.txt: wrap shell listing in "----" 1925fe0c8a Documentation: wrap config listings in "----" 922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor 2017956a19 Documentation: wrap blocks with "--" dd2e50a84e commit-graph: turn off save_commit_buffer 67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits 806278dead commit-graph.c: handle corrupt/missing trees 16749b8dd2 commit-graph.c: handle commit parsing errors 23424ea759 t/t5318: introduce failing 'git commit-graph write' tests bf1e28e0ad builtin/rebase.c: Remove pointless message d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing bd482d6e33 t: use common $SQ variable 3a37876b5d pack-objects: drop packlist index_pos optimization 7e6b96c73b test-read-cache: drop namelen variable e4b369069e diff-delta: set size out-parameter to 0 for NULL delta 7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint f1cbd033e2 pack-objects: use object_id in packlist_alloc() 0dfed92dfd git-am: handle missing "author" when parsing commit 3960290675 ci: restore running httpd tests 6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests c77722b3ea use get_tagged_oid() dad3f0607b tag: factor out get_tagged_oid() 468ce99b77 unpack-trees: rename 'is_excluded_from_list()' 65edd96aec treewide: rename 'exclude' methods to 'pattern' 4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_' caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list' ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern' 483e861111 t9902: use a non-deprecated command for testing 9df53c5de6 Recommend git-filter-repo instead of git-filter-branch 7b6ad97939 t6006: simplify, fix, and optimize empty message test 50094ca45f config/format.txt: specify default value of format.coverLetter c1a6f21cd4 Doc: add more detail for git-format-patch 854b5cb46a t4014: stop losing return codes of git commands dd2b6b6860 t4014: remove confusing pipe in check_threading() 6bd26f58ea t4014: use test_line_count() where possible c6ec6dadba t4014: let sed open its own files f2e2fa8f60 t4014: drop redirections to /dev/null 460609cbd5 t4014: use indentable here-docs 92014b69bb t4014: remove spaces after redirect operators 0ab74e979c t4014: use sq for test case names cb46c40662 t4014: move closing sq onto its own line b562a54c01 t4014: s/expected/expect/ e770fbfeff t3005: remove unused variable da280f5f1a t: use LF variable defined in the test harness 7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch 552fc5016f mingw: apply array.cocci rule 476998d05b t3427: accelerate this test by using fast-export and fast-import aac6ff7b5b .gitignore: stop ignoring `.manifest` files 2c65d90f75 am: reload .gitattributes after patching it 1577dc0f7c tree: simplify parse_tree_indirect() 50f26bd035 fetch: add fetch.writeCommitGraph config setting 8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set 27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options 0a8bc7068f clarify documentation for remote helpers 80e3658647 help: make help_unknown_ref() NORETURN 313677627a checkout: add simple check for 'git checkout -b' 3441de5b9c gitk: Make web links clickable a4fa2f0a4c git-gui: allow undoing last revert 414d924beb rebase: teach rebase --keep-base 6330209d7d rebase tests: test linear branch topology 4effc5bc96 rebase: fast-forward --fork-point in more cases c0efb4c1dd rebase: fast-forward --onto in more cases 2b318aa6c3 rebase: refactor can_fast_forward into goto tower c9efc21683 t3432: test for --no-ff's interaction with fast-forward 1ebec8dfc1 fast-import: duplicate into history rather than passing ownership 9756082b3c fast-import: duplicate parsed encoding string 86ae43da6a status: mention --skip for revert and cherry-pick b1b16bba96 completion: add --skip for cherry-pick and revert deaa65a754 completion: merge options for cherry-pick and revert 4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests 793ac7e309 t3432: test rebase fast-forward behavior 359ecebc34 t3431: add rebase --fork-point tests 502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage ff61681b46 grep: refactor and simplify PCRE1 support 8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1 1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning() fd99c2dd9b grep: use return value of strbuf_detach() 82f51af345 log-tree: always use return value of strbuf_detach() 7e92756751 http: don't leak urlmatch_config.vars 9784f97321 commit: free the right buffer in release_commit_memory ce17feb1b3 path: add a function to check for path suffix 60d198d022 banned.h: fix vsprintf()'s ban message 60fe477a0b notes: avoid potential use-after-free during insertion 779ad6641b notes: avoid leaking duplicate entries 4e1a641ee3 mingw: fix launching of externals from Unicode paths 5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly e2683d51d9 Fix .git/ discovery at the root of UNC shares d17f2124a7 setup_git_directory(): handle UNC paths correctly ebb8d2c90f mingw: support UNC in git clone file://server/share/repo 0c37c41d13 t4009: make hash size independent c1f3dfcc23 t4002: make hash independent 8cc5ff83c3 t4000: make hash size independent c784815073 t3903: abstract away SHA-1-specific constants 2ccdfb1c78 git-gui: return early when patch fails to apply 62bd99934b git-gui: allow reverting selected hunk 5f0a516de9 git-gui: allow reverting selected lines fddf2ebe38 transport: teach all vtables to allow fetch first ac3fda82bf transport-helper: skip ls-refs if unnecessary 745f681289 First batch after Git 2.23 d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg' 22e86e85cb Merge branch 'en/fast-import-merge-doc' 9c7573581c Merge branch 'jk/perf-no-dups' 4336fdb2ef Merge branch 'rs/nedalloc-fixlets' 8ae7a46c4d Merge branch 'sg/show-failed-test-names' 6ba06b582b Merge branch 'sg/commit-graph-validate' 072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix' 207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix' 77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests' 1b01cdbf2e Merge branch 'jk/tree-walk-overflow' 8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix' 307179732d Merge branch 'mt/grep-submodules-working-tree' 58166c2e9d t0021: make sure clean filter runs 8b3f33ef11 ref-filter: initialize empty name or email fields 3c81760bc6 userdiff: add a builtin pattern for dts files fe49814409 t4014: drop unnecessary blank lines from test cases a2bb801f6a line-log: avoid unnecessary full tree diffs eef5204190 line-log: extract pathspec parsing from line ranges into a helper function a63694f523 diff: skip GITLINK when lazy fetching missing objs 7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe 19800bdc3f parseopt: move definition of enum parse_opt_result up 415b770b88 packfile.h: drop extern from function declaration acb49d1cc8 t3800: make hash-size independent ca6ba94200 t3600: make hash size independent 19ce5496c2 t3506: make hash independent 9a6738c061 t3430: avoid hard-coded object IDs 4dd1b5f90f t3404: abstract away SHA-1-specific constants b99bfc7a6c t3306: abstract away SHA-1-specific constants e3e9d02e35 t3305: make hash size independent b408cf8cf6 t3301: abstract away SHA-1-specific constants b561edd213 t3206: abstract away hash size constants a5f61c7d13 t3201: abstract away SHA-1-specific constants 1c24a54ea4 repository-layout.txt: correct pluralization of 'object' b0a3186140 sequencer: simplify root commit creation a47ba3c777 rebase -i: check for updated todo after squash and reword 450efe2d53 rebase -i: always update HEAD before rewording c581e4a749 grep: under --debug, show whether PCRE JIT is enabled aaa95dfa05 midx: switch to using the_hash_algo be8e172e9f builtin/show-index: replace sha1_to_hex 3f34d70d40 rerere: replace sha1_to_hex fc06be3b7f builtin/receive-pack: replace sha1_to_hex 69fa337060 builtin/index-pack: replace sha1_to_hex 3a4d7aa5ae packfile: replace sha1_to_hex e0cb7cdb89 wt-status: convert struct wt_status to object_id 8d4d86b0f0 cache: remove null_sha1 f6ca67d673 builtin/worktree: switch null_sha1 to null_oid dd336a5511 builtin/repack: write object IDs of the proper length 894c0f66bb pack-write: use hash_to_hex when writing checksums 4439c7a360 sequencer: convert to use the_hash_algo 95518faac1 bisect: switch to using the_hash_algo e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo fe9fec45f6 config: use the_hash_algo in abbrev comparison 976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo 703d2d4193 bundle: switch to use the_hash_algo 9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo 7962e046ff show-index: switch hard-coded constants to the_hash_algo fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ 7e0d029f18 builtin/rev-parse: switch to use the_hash_algo 319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo f6af19a9ad fetch-pack: use parse_oid_hex 36261e42ec patch-id: convert to use the_hash_algo 28ba1830d0 builtin/replace: make hash size independent 24bc1a1292 pull, fetch: add --set-upstream option 71d41ff651 archive-tar: turn length miscalculation warning into BUG 17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header() 82a46af13e archive-tar: fix pax extended header length calculation 4060c1990a archive-tar: report wrong pax extended header length 4615a8cb5b merge-recursive: alphabetize include list 45ef16f77a merge-recursive: add sanity checks for relevant merge_options f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* 5bf7e5779e merge-recursive: split internal fields into a separate struct e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output a779fb829b merge-recursive: comment and reorder the merge_options fields 8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options 7c0a6c8e47 merge-recursive: move some definitions around to clean up the header c749ab1da8 merge-recursive: rename merge_options argument to opt in header bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list 4d7101e25c merge-recursive: fix some overly long lines 724dd767b2 cache-tree: share code between functions writing an index as a tree 345480d1ed merge-recursive: don't force external callers to do our logging b4db8a2b76 merge-recursive: remove useless parameter in merge_trees() 98a1d3d888 merge-recursive: exit early if index != head 9822175d2b Ensure index matches head before invoking merge machinery, round N 10f751c06b merge-recursive: remove another implicit dependency on the_repository f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks 8e01251694 merge-recursive: introduce an enum for detect_directory_renames values 743474cbfa merge-recursive: provide a better label for diff3 common ancestor 51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u) 5bace62582 l10n: Update Catalan translation 139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees() 65c01c6442 checkout: provide better conflict hunk description with detached HEAD d8523ca1b9 merge-recursive: be consistent with assert acb7da05ac checkout: remove duplicate code 93b980e58f http: use xmalloc with cURL 64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental aaf633c2ad repo-settings: create feature.experimental setting c6cc4c5afd repo-settings: create feature.manyFiles setting ad0fb65999 repo-settings: parse core.untrackedCache 31b1de6a09 commit-graph: turn on commit-graph by default b068d9a250 t6501: use 'git gc' in quiet mode 7211b9e753 repo-settings: consolidate some config settings 507e5470a0 worktree remove: clarify error message on dirty worktree 5af9d5f6c8 completion: complete config variables and values for 'git clone --config=' 88cd790d6a completion: complete config variables names and values for 'git clone -c' dd33472831 completion: complete values of configuration variables after 'git -c var=' e1e00089da completion: complete configuration sections and variable names for 'git -c' 42d0efec59 completion: split _git_config() d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp() 2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names d9438873c4 completion: deduplicate configuration sections 7a09a8f093 completion: add tests for 'git config' completion 840d7e5b3c completion: complete more values of more 'color.*' configuration variables 08a12175d8 completion: fix a typo in a comment 9827d4c185 packfile: drop release_pack_memory() d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed 362f8b280c t/perf: rename duplicate-numbered test script 742ed63345 trace2: cleanup whitespace in perf format e34430556c trace2: cleanup whitespace in normal format c2b890aca5 quote: add sq_append_quote_argv_pretty() ad43e37839 trace2: trim trailing whitespace in normal format error message 04f10d332f trace2: remove dead code in maybe_add_string_va() da4589ce7e trace2: trim whitespace in region messages in perf target format 0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit 5440eb0ea2 git-gui: call do_quit before destroying the main window bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook 6098817fd7 git-merge: honor pre-merge-commit hook a1f3dd7eb3 merge: do no-verify like commit f78f6c7e0c t7503: verify proper hook execution 70597e8386 nedmalloc: avoid compiler warning about unused value c9b9c09dae nedmalloc: do assignments only after the declaration section 22932d9169 config: stop checking whether the_repository is NULL 5732f2b1ef common-main: delay trace2 initialization 58ebccb478 t1309: use short branch name in includeIf.onbranch test 67feca3b1c gitcli: document --end-of-options 51b4594b40 parse-options: allow --end-of-options as a synonym for "--" 19e8789b23 revision: allow --end-of-options to end option parsing ffe1afe67c tests: show the test name and number at the start of verbose output 96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests 7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits' 39d8831856 commit-graph: turn a group of write-related macro flags into an enum 9916073be5 t5318-commit-graph: use 'test_expect_code' 620c09e1b6 restore: add test for deleted ita files ecd72042de checkout.c: unstage empty deleted ita files a613d4f817 pack-refs: always refresh after taking the lock file decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd' 371df1bea9 trace2: cleanup column alignment in perf target format 5aa02f9868 tree-walk: harden make_traverse_path() length computations c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path() b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len() 37806080d7 tree-walk: use size_t consistently 7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh' 12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh' 9055384710 tree-walk: drop oid from traverse_info 947208b725 setup_traverse_info(): stop copying oid e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` a63f990d92 t3418: test `rebase -r` with merge strategies 5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges` e145d99347 rebase -r: support merge strategies other than `recursive` 4e6023b13a t3427: fix another incorrect assumption f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced a9c71073da t3427: fix erroneous assumption b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case c248d32cdb t3427: simplify the `setup` test case significantly 8c1e24048a t3427: add a clarifying comment 5efed0ecf9 rebase: fold git-rebase--common into the -p backend 68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone 2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive` 6180b20239 t3400: stop referring to the scripted rebase d5b581f228 Drop unused git-rebase--am.sh 814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation 6a289d45c0 grep: fix worktree case in submodules 870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching 8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data 09872f6418 grep: create a "is_fixed" member in "grep_pat" 8a35b540a9 grep: consistently use "p->fixed" in compile_regexp() 685668faaa grep: stop using a custom JIT stack with PCRE v1 34489239d0 grep: stop "using" a custom JIT stack with PCRE v2 04bef50c01 grep: remove overly paranoid BUG(...) code b65abcafc7 grep: use PCRE v2 for optimized fixed-string search 48de2a768c grep: remove the kwset optimization 45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern> 25754125ce grep: make the behavior for NUL-byte in patterns sane d316af059d grep tests: move binary pattern tests into their own file 471dac5d2c grep tests: move "grep binary" alongside the rest f463beb805 grep: inline the return value of a function call used only once b14cf112e2 t4210: skip more command-line encoding tests on MinGW 44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>" 4e2443b181 log tests: test regex backends in "--encode=<enc>" tests 90d21f9ebf list-objects-filter-options: make parser void 5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW 489fc9ee71 list-objects-filter-options: allow mult. --filter c2694952e3 strbuf: give URL-encoding API a char predicate fn cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list f56f764279 list-objects-filter-options: move error check up e987df5fe6 list-objects-filter: implement composite filters 842b00516a list-objects-filter-options: always supply *errbuf 7a7c7f4a6d list-objects-filter: put omits set in filter struct 9430147ca0 list-objects-filter: encapsulate filter components 4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c 60b7a92d84 Move repository_format_partial_clone to promisor-remote.c db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} 75de085211 remote: add promisor and partial clone config to the doc 7e154badc0 partial-clone: add multiple remotes in the doc 9a4c507886 t0410: test fetching from many promisor remotes 5e46139376 builtin/fetch: remove unique promisor remote limitation fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote() faf2abf496 promisor-remote: use repository_format_partial_clone 9cfebc1f3b promisor-remote: add promisor_remote_reinit() 9e27beaa23 promisor-remote: implement promisor_remote_get_direct() 48de315817 Add initial support for many promisor remotes 2e860675b6 fetch-object: make functions return an error code c59c7c879e t0410: remove pipes after git commands git-subtree-dir: third_party/git git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
"L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-"
"upstream-to."
#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "%s està bé\n"
#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "Cal un dipòsit per a fer un farcell."
#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "Cal un dipòsit per a desfer un farcell."
#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
msgstr ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
#: builtin/cat-file.c:616
#, fuzzy
msgid "only one batch option may be specified"
msgstr "Cap nom de branca especificat"
#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
#: builtin/cat-file.c:635
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
#: builtin/cat-file.c:636
msgid "show object size"
msgstr "mostra la mida de l'objecte"
#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "surt amb zero quan no hi ha error"
#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte"
#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr ""
"en els objectes de blob, executa els filtres en el contingut de l'objecte"
#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "usa un camí específic per a --textconv/--filters"
#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "mostra tots els objectes amb --batch o --batch-check"
#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr ""
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..."
#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <atribut>...]"
#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "informa de tots els atributs establerts en el fitxer"
#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "usa .gitattributes només des de l'índex"
#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
msgstr "llegeix els noms de fitxer de stdin"
#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "omet els informes de progrés"
#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "mostra els camins d'entrada que no coincideixin"
#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "ignora l'índex en comprovar"
#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "no es poden especificar noms de camí amb --stdin"
#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "-z només té sentit amb --stdin"
#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "cap camí especificat"
#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet només és vàlid amb un sol nom de camí"
#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr "no es poden especificar --quiet i --verbose alhora"
#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching és vàlid només amb --verbose"
#: builtin/check-mailmap.c:9
msgid "git check-mailmap [<options>] <contact>..."
msgstr "git check-mailmap [<opcions>] <contacte>..."
#: builtin/check-mailmap.c:14
msgid "also read contacts from stdin"
msgstr "també llegeix els contactes des de stdin"
#: builtin/check-mailmap.c:25
#, c-format
msgid "unable to parse contact: %s"
msgstr "no s'ha pogut analitzar el contacte: %s"
#: builtin/check-mailmap.c:48
msgid "no contacts specified"
msgstr "no hi ha contactes especificats"
#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]"
#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "«stage» ha de ser entre 1 i 3 o all"
#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "agafa tots els fitxers en l'índex"
#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "força la sobreescriptura de fitxers existents"
#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr ""
"cap advertència per a fitxers existents i fitxers que no siguin a l'índex"
#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "no agafis fitxers nous"
#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "llegeix la llista de camins des de l'entrada estàndard"
#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "escriu el contingut a fitxers temporals"
#: builtin/checkout-index.c:178 builtin/column.c:31
#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
#: builtin/worktree.c:680
msgid "string"
msgstr "cadena"
#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr "en crear fitxers, anteposa <cadena>"
#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "copia els fitxers des de «stage» amb nom"
#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opcions>] <branca>"
#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
#: builtin/checkout.c:37
#, fuzzy
msgid "git switch [<options>] [<branch>]"
msgstr "git checkout [<opcions>] <branca>"
#: builtin/checkout.c:42
#, fuzzy
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "el camí «%s» no té la nostra versió"
#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "el camí «%s» no té la seva versió"
#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "el camí «%s» no té totes les versions necessàries"
#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "el camí «%s» no té les versions necessàries"
#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "camí «%s»: no es pot fusionar"
#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
#: builtin/checkout.c:374
#, fuzzy, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "etiqueta de fusió incorrecta en la comissió «%s»"
msgstr[1] "etiqueta de fusió incorrecta en la comissió «%s»"
#: builtin/checkout.c:379
#, fuzzy, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "actualitzat %d camí\n"
msgstr[1] "actualitzats %d camins\n"
#: builtin/checkout.c:386
#, fuzzy, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "S'ha produït un error en llegir l'índex"
msgstr[1] "S'ha produït un error en llegir l'índex"
#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "«%s» no es pot usar amb actualització de camins"
#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "«%s» no es pot usar amb %s"
#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada."
#: builtin/checkout.c:433
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
#: builtin/checkout.c:437
#, fuzzy, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "«%s» no es pot usar amb «%s»"
#: builtin/checkout.c:442 builtin/checkout.c:447
#, fuzzy, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "%s: %s no es pot usar amb %s"
#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr "el camí «%s» està sense fusionar"
#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "heu de primer resoldre el vostre índex actual"
#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
#: builtin/checkout.c:736
#, fuzzy, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%s"
#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No es pot fer reflog per a «%s»: %s\n"
#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD ara és a"
#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca «%s»\n"
#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja en «%s»\n"
#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha canviat i restablert a la branca «%s»\n"
#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha canviat a la branca nova «%s»\n"
#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha canviat a la branca «%s»\n"
#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgid_plural ""
"Warning: you are leaving %d commits behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgstr[0] ""
"Advertència: esteu deixant enrere %d comissió, no\n"
"vinculada a cap de les vostres branques:\n"
"\n"
"%s\n"
msgstr[1] ""
"Advertència: esteu deixant enrere %d comissions, no\n"
"vinculades a cap de les vostres branques:\n"
"\n"
"%s\n"
#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
" git branch <new-branch-name> %s\n"
"\n"
msgid_plural ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
" git branch <new-branch-name> %s\n"
"\n"
msgstr[0] ""
"Si la voleu mantenir creant una branca nova, ara pot ser un bon moment\n"
"per a fer-ho amb:\n"
"\n"
" git branch <nom-de-branca-nova> %s\n"
"\n"
msgstr[1] ""
"Si les voleu mantenir creant una branca nova, ara pot ser un bon moment\n"
"per a fer-ho amb:\n"
"\n"
" git branch <nom-de-branca-nova> %s\n"
"\n"
#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de néixer"
#: builtin/checkout.c:1176
#, fuzzy
msgid "only one reference expected"
msgstr "s'esperava només una referència, s'han donat %d."
#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "s'esperava només una referència, s'han donat %d."
#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
#: builtin/checkout.c:1303
#, fuzzy, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "no es pot llegir l'objecte %s «%s»"
#: builtin/checkout.c:1305
#, fuzzy, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr ""
"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
#: builtin/checkout.c:1306 builtin/checkout.c:1314
#, fuzzy, c-format
msgid "a branch is expected, got '%s'"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
#: builtin/checkout.c:1309
#, fuzzy, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "La vostra branca està al dia amb «%s».\n"
#: builtin/checkout.c:1325
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
#: builtin/checkout.c:1329
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
#: builtin/checkout.c:1333
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
#: builtin/checkout.c:1337
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
#: builtin/checkout.c:1341
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
#: builtin/checkout.c:1345
#, fuzzy
msgid "you are switching branch while bisecting"
msgstr "Actualment esteu bisecant."
#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "«%s» no es pot usar amb canvi de branca"
#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» no es pot usar amb «%s»"
#: builtin/checkout.c:1380
#, fuzzy, c-format
msgid "'%s' cannot take <start-point>"
msgstr "«%s» no es pot usar amb actualització de camins"
#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No es pot canviar la branca a la no comissió «%s»"
#: builtin/checkout.c:1395
#, fuzzy
msgid "missing branch or commit argument"
msgstr "Manca el nom de branca; proveu -b"
#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "força l'informe de progrés"
#: builtin/checkout.c:1438
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318
msgid "style"
msgstr "estil"
#: builtin/checkout.c:1440
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "separa HEAD a la comissió anomenada"
#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
#: builtin/checkout.c:1455
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevol modificació local)"
#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "branca-nova"
#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "branca òrfena nova"
#: builtin/checkout.c:1459 builtin/merge.c:288
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
#: builtin/checkout.c:1462
msgid "do not check if another worktree is holding the given ref"
msgstr "no comprovis si altre arbre de treball té la referència donada"
#: builtin/checkout.c:1475
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
#: builtin/checkout.c:1478
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
#: builtin/checkout.c:1482
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mútuament excloents"
#: builtin/checkout.c:1536
#, fuzzy
msgid "-p and --overlay are mutually exclusive"
msgstr "-n i -k són mútuament excloents."
#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
#: builtin/checkout.c:1578
#, fuzzy
msgid "missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
#: builtin/checkout.c:1611
#, fuzzy, c-format
msgid "could not resolve %s"
msgstr "no s'ha pogut resoldre «%s»"
#: builtin/checkout.c:1623
#, fuzzy
msgid "you must specify path(s) to restore"
msgstr "Heu d'especificar un directori."
#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta "
"comissió"
#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»"
#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
"agafar de l'índex."
#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"We found %d remotes with a reference that matched. So we fell back\n"
"on trying to resolve the argument as a path, but failed there too!\n"
"\n"
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
msgid "branch"
msgstr "branca"
#: builtin/checkout.c:1692
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
#: builtin/checkout.c:1694
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
#: builtin/checkout.c:1695
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
#: builtin/checkout.c:1697
#, fuzzy
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "dubta 'git checkout <cap-branca-així>'"
#: builtin/checkout.c:1698
#, fuzzy
msgid "use overlay mode (default)"
msgstr "poda les referències soltes (per defecte)"
#: builtin/checkout.c:1734
#, fuzzy
msgid "create and switch to a new branch"
msgstr "crea i agafa una branca nova"
#: builtin/checkout.c:1736
#, fuzzy
msgid "create/reset and switch to a branch"
msgstr "crea/restableix i agafa una branca"
#: builtin/checkout.c:1738
#, fuzzy
msgid "second guess 'git switch <no-such-branch>'"
msgstr "dubta 'git checkout <cap-branca-així>'"
#: builtin/checkout.c:1740
#, fuzzy
msgid "throw away local modifications"
msgstr "agafa a la força (descarta qualsevol modificació local)"
#: builtin/checkout.c:1772
#, fuzzy
msgid "where the checkout from"
msgstr "llegeix l'objecte des de stdin"
#: builtin/checkout.c:1774
#, fuzzy
msgid "restore the index"
msgstr "S'ha produït un error en llegir l'índex"
#: builtin/checkout.c:1776
#, fuzzy
msgid "restore the working tree (default)"
msgstr "Mostra l'estat de l'arbre de treball"
#: builtin/checkout.c:1778
#, fuzzy
msgid "ignore unmerged entries"
msgstr "s'està ignorant %s no fusionat\n"
#: builtin/checkout.c:1779
msgid "use overlay mode"
msgstr ""
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..."
#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "S'està eliminant %s\n"
#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "Eliminaria %s\n"
#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "S'està ometent el dipòsit %s\n"
#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "Ometria el dipòsit %s\n"
#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "s'ha produït un error en eliminar %s"
#: builtin/clean.c:37
#, fuzzy, c-format
msgid "could not lstat %s\n"
msgstr "no s'ha pogut fer stat a %s"
#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
"foo - select item based on unique prefix\n"
" - (empty) select nothing\n"
msgstr ""
"Ajuda:\n"
"1 - selecciona un ítem numerat\n"
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res\n"
#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
"3-5 - select a range of items\n"
"2-3,6-9 - select multiple ranges\n"
"foo - select item based on unique prefix\n"
"-... - unselect specified items\n"
"* - choose all items\n"
" - (empty) finish selecting\n"
msgstr ""
"Ajuda:\n"
"1 - selecciona un sol ítem\n"
"3-5 - selecciona un rang d'ítems\n"
"2-3,6-9 - selecciona múltiples rangs\n"
"foo - selecciona un ítem basat en un prefix únic\n"
"-... - desselecciona els ítems seleccionats\n"
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció\n"
#: builtin/clean.c:520 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Perdó (%s)?\n"
#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s"
#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Adéu.\n"
#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"select by numbers - select items to be deleted by numbers\n"
"ask each - confirm each deletion (like \"rm -i\")\n"
"quit - stop cleaning\n"
"help - this screen\n"
"? - help for prompt selection"
msgstr ""
"clean - comença a netejar\n"
"filter by pattern - exclou ítems de supressió\n"
"select by numbers - selecciona ítems a suprimir per números\n"
"ask each - confirma cada supressió (com \"rm -i\")\n"
"quit - deixa de netejar\n"
"help - aquesta pantalla\n"
"? - ajuda de selecció de l'avís"
#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Ordres ***"
#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "I ara què"
#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Eliminaria l'ítem següent:"
msgstr[1] "Eliminaria els ítems següents:"
#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "No hi ha més fitxers a netejar; s'està sortint."
#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
#: builtin/clean.c:910
msgid "force"
msgstr "força"
#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "neteja interactiva"
#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "elimina directoris sencers"
#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188
#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patró"
#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x i -X no es poden usar junts"
#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "no facis cap agafament"
#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "crea un dipòsit mirall (implica bare)"
#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "per a clonar des d'un dipòsit local"
#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "configura com a dipòsit compartit"
#: builtin/clone.c:107
msgid "pathspec"
msgstr "especificació de camí"
#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "nombre de submòduls clonats en paral·lel"
#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "directori-de-plantilla"
#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "directori des del qual s'usaran les plantilles"
#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "dipòsit de referència"
#: builtin/clone.c:118 builtin/submodule--helper.c:1382
#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
#: builtin/pack-objects.c:3308 builtin/repack.c:330
msgid "name"
msgstr "nom"
#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc de la HEAD del remot"
#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
#: builtin/pull.c:226
msgid "depth"
msgstr "profunditat"
#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297
msgid "time"
msgstr "hora"
#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "crea un clon superficial des d'una hora específica"
#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
#: builtin/rebase.c:1395
msgid "revision"
msgstr "revisió"
#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen"
#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "qualsevol submòdul clonat serà superficial"
#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "directori de git"
#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
#: builtin/clone.c:139
msgid "key=value"
msgstr "clau=valor"
#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "específic al servidor"
#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "opció a transmetre"
#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "usa només adreces IPv4"
#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "usa només adreces IPv6"
#: builtin/clone.c:149
#, fuzzy
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "qualsevol submòdul clonat serà superficial"
#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
"No s'ha pogut endevinar cap nom de directori.\n"
"Especifiqueu un directori en la línia d'ordres"
#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n"
#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
#: builtin/clone.c:428
#, fuzzy, c-format
msgid "failed to start iterator over '%s'"
msgstr "no s'ha pogut escriure a «%s»"
#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha produït un error en desenllaçar «%s»"
#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha produït un error en crear l'enllaç «%s»"
#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "s'ha produït un error en copiar el fitxer a «%s»"
#: builtin/clone.c:467
#, fuzzy, c-format
msgid "failed to iterate over '%s'"
msgstr "s'ha produït un error en eliminar «%s»"
#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "fet.\n"
#: builtin/clone.c:506
#, fuzzy
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"El clonatge ha tingut èxit, però l'agafament ha\n"
"fallat. Podeu inspeccionar què s'ha agafat amb\n"
"'git status' i tornar a intentar l'agafament amb\n"
"'git checkout -f HEAD'\n"
#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
"agafar.\n"
#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "el dipòsit «%s» no existeix"
#: builtin/clone.c:977 builtin/fetch.c:1653
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "el camí destí «%s» ja existeix i no és un directori buit."
#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball «%s» ja existeix."
#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "S'està clonant al dipòsit nu «%s»...\n"
#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "S'està clonant a «%s»...\n"
#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive no és compatible amb ambdós --reference i --reference-if-"
"able"
#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."
#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això."
#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això."
#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això."
#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, s'està ignorant --local"
#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local s'ignora"
#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branca remota %s no es troba en la font %s"
#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
#: builtin/column.c:10
msgid "git column [<options>]"
msgstr "git column [<opcions>]"
#: builtin/column.c:27
msgid "lookup config vars"
msgstr "cerca les variables de configuració"
#: builtin/column.c:28 builtin/column.c:29
msgid "layout to use"
msgstr "disposició a usar"
#: builtin/column.c:30
msgid "Maximum width"
msgstr "Amplada màxima"
#: builtin/column.c:31
msgid "Padding space on left border"
msgstr "Espai d'encoixinada en el marge esquerre"
#: builtin/column.c:32
msgid "Padding space on right border"
msgstr "Espai d'encoixinada en el marge dret"
#: builtin/column.c:33
msgid "Padding space between columns"
msgstr "Espai d'encoixinada entre columnes"
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr "--command ha de ser el primer paràmetre"
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
"<file>)...] <tree>"
msgstr ""
#: builtin/commit-tree.c:31
#, fuzzy, c-format
msgid "duplicate parent %s ignored"
msgstr "suprimeix les referències reemplaçades"
#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542
#, fuzzy, c-format
msgid "not a valid object name %s"
msgstr "no és un nom d'objecte vàlid: %s"
#: builtin/commit-tree.c:93
#, fuzzy, c-format
msgid "git commit-tree: failed to open '%s'"
msgstr "s'ha produït un error en obrir «%s»"
#: builtin/commit-tree.c:96
#, fuzzy, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git write-tree ha fallat en escriure un arbre"
#: builtin/commit-tree.c:98
#, fuzzy, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git write-tree ha fallat en escriure un arbre"
#: builtin/commit-tree.c:111
#, fuzzy
msgid "parent"
msgstr "pare"
#: builtin/commit-tree.c:112
#, fuzzy
msgid "id of a parent commit object"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
#: builtin/tag.c:412
msgid "message"
msgstr "missatge"
#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr "missatge de comissió"
#: builtin/commit-tree.c:118
#, fuzzy
msgid "read commit log message from file"
msgstr "llegiu el missatge des d'un fitxer"
#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "signa la comissió amb GPG"
#: builtin/commit-tree.c:133
#, fuzzy
msgid "must give exactly one tree"
msgstr "Cal exactament un rang."
#: builtin/commit-tree.c:140
#, fuzzy
msgid "git commit-tree: failed to read"
msgstr "git write-tree ha fallat en escriure un arbre"
#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opcions>] [--] <especificació-de-camí>..."
#: builtin/commit.c:51
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
"Heu demanat esmenar la comissió més recent, però fer això la\n"
"deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"
"podeu eliminar la comissió per complet amb \"git reset HEAD^\".\n"
#: builtin/commit.c:56
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
"\n"
" git commit --allow-empty\n"
"\n"
msgstr ""
"El «cherry pick» previ ja està buit, possiblement a causa de resolució de "
"conflicte.\n"
"Si el voleu cometre de totes maneres, useu:\n"
"\n"
" git commit --allow-empty\n"
"\n"
#: builtin/commit.c:63
#, fuzzy
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "D'altra manera, useu «git reset»\n"
#: builtin/commit.c:66
msgid ""
"and then use:\n"
"\n"
" git cherry-pick --continue\n"
"\n"
"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
" git cherry-pick --skip\n"
"\n"
msgstr ""
#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "a la comissió «%s» li manca la capçalera d'autor"
#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "la comissió «%s» té una línia d'autor mal formada"
#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n"
#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"
#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
"\n"
"Sembla que podeu estar cometent una fusió.\n"
"Si això no és correcte, elimineu el fitxer\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
"\n"
"Sembla que podeu estar cometent un «cherry pick».\n"
"Si això no és correcte, elimineu el fitxer\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
"Introduïu el missatge de comissió dels vostres canvis.\n"
"S'ignoraran les línies que comencin amb «%c», i un missatge de\n"
"comissió buit avorta la comissió.\n"
#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
"Introduïu el missatge de comissió dels vostres canvis.\n"
"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les "
"vosaltres\n"
"mateixos si voleu. Un missatge buit avorta la comissió.\n"
#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Error en construir arbres"
#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n"
#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n"
"cap autor existent"
#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "mode ignorat no vàlid «%s»"
#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits no vàlid «%s»"
#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambdós --reset-author i --author no té sentit"
#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Només un de -c/-C/-F/--fixup es pot usar."
#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "L'opció -m no es pot combinar amb -c/-C/-F/."
#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author només es pot usar amb -C, -c o --amend."
#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
#: builtin/commit.c:1208
#, fuzzy, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "-a no té sentit amb camins."
#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "mostra l'estat concisament"
#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "mostra la informació de branca"
#: builtin/commit.c:1343
msgid "show stash information"
msgstr "mostra la informació de «stash»"
#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr ""
#: builtin/commit.c:1347
msgid "version"
msgstr "versió"
#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "mode"
#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
"defecte: all)"
#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
"(Per defecte: traditional, matching, no.)"
#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "quan"
#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "no detectis canvis de noms"
#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança"
#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
#: builtin/commit.c:1498
msgid "author"
msgstr "autor"
#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "autor corregit de la comissió"
#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "data"
#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "data corregida de la comissió"
#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "comissió"
#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usa el missatge formatat de «squash» automàtic per a corregir la comissió "
"especificada"
#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió "
"especificada"
#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289
#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evita els lligams de precomissió i missatge de comissió"
#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "mostra què es cometria"
#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "evita el lligam de post escriptura"
#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "S'està avortant la comissió; no heu editat el missatge.\n"
#: builtin/commit.c:1688
#, fuzzy
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"s'ha actualitzat el dipòsit, però no es pot escriure el\n"
"fitxer new_index. Comproveu que el disc no estigui ple i\n"
"que no s'hagi excedit la quota, i després feu \n"
"«git reset HEAD» per a recuperar-ho."
#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
msgstr ""
#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
#: builtin/log.c:1601
msgid "dir"
msgstr "directori"
#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr ""
#: builtin/commit-graph.c:57
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, fuzzy, c-format
msgid "Could not open commit-graph '%s'"
msgstr "no s'ha pogut analitzar la comissió «%s»"
#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr ""
#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr ""
#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
#: builtin/commit-graph.c:172
#, fuzzy
msgid "allow writing an incremental commit-graph file"
msgstr "Escriu i verifica els fitxers commit-graph de Git"
#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
#: builtin/commit-graph.c:176
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [<opcions>]"
#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "paràmetre --type no reconegut, %s"
#: builtin/config.c:115
msgid "only one type at a time"
msgstr "només un tipus cada cop"
#: builtin/config.c:124
msgid "Config file location"
msgstr "Ubicació del fitxer de configuració"
#: builtin/config.c:125
msgid "use global config file"
msgstr "usa el fitxer de configuració global"
#: builtin/config.c:126
msgid "use system config file"
msgstr "usa el fitxer de configuració del sistema"
#: builtin/config.c:127
msgid "use repository config file"
msgstr "usa el fitxer de configuració del dipòsit"
#: builtin/config.c:128
msgid "use per-worktree config file"
msgstr "usa un fitxer de configuració per dipòsit"
#: builtin/config.c:129
msgid "use given config file"
msgstr "usa el fitxer de configuració donat"
#: builtin/config.c:130
msgid "blob-id"
msgstr "ID de blob"
#: builtin/config.c:130
msgid "read config from given blob object"
msgstr "llegeix la configuració de l'objecte de blob donat"
#: builtin/config.c:131
msgid "Action"
msgstr "Acció"
#: builtin/config.c:132
msgid "get value: name [value-regex]"
msgstr "obtén valor: nom [regex-de-valors]"
#: builtin/config.c:133
msgid "get all values: key [value-regex]"
msgstr "obtén tots els valors: clau [regex-de-valors]"
#: builtin/config.c:134
msgid "get values for regexp: name-regex [value-regex]"
msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]"
#: builtin/config.c:135
msgid "get value specific for the URL: section[.var] URL"
msgstr "obtén el valor específic per a l'URL: secció[.variable] URL"
#: builtin/config.c:136
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]"
#: builtin/config.c:137
msgid "add a new variable: name value"
msgstr "afegeix una variable nova: nom valor"
#: builtin/config.c:138
msgid "remove a variable: name [value-regex]"
msgstr "elimina una variable: nom [regex-de-valors]"
#: builtin/config.c:139
msgid "remove all matches: name [value-regex]"
msgstr "elimina totes les coincidències: nom [regex-de-valors]"
#: builtin/config.c:140
msgid "rename section: old-name new-name"
msgstr "canvia el nom de secció: nom-antic nom-nou"
#: builtin/config.c:141
msgid "remove a section: name"
msgstr "elimina una secció: nom"
#: builtin/config.c:142
msgid "list all"
msgstr "llista tots"
#: builtin/config.c:143
msgid "open an editor"
msgstr "obre un editor"
#: builtin/config.c:144
msgid "find the color configured: slot [default]"
msgstr "troba el color configurat: ranura [per defecte]"
#: builtin/config.c:145
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "troba el paràmetre de color: ranura [stdout-és-tty]"
#: builtin/config.c:146
msgid "Type"
msgstr "Tipus"
#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "el valor té donat aquest tipus"
#: builtin/config.c:148
msgid "value is \"true\" or \"false\""
msgstr "el valor és \"true\" o \"false\""
#: builtin/config.c:149
msgid "value is decimal number"
msgstr "el valor és un nombre decimal"
#: builtin/config.c:150
msgid "value is --bool or --int"
msgstr "el valor és --bool o --int"
#: builtin/config.c:151
msgid "value is a path (file or directory name)"
msgstr "el valor és un camí (nom de fitxer o directori)"
#: builtin/config.c:152
msgid "value is an expiry date"
msgstr "el valor és una data de venciment"
#: builtin/config.c:153
msgid "Other"
msgstr "Altre"
#: builtin/config.c:154
msgid "terminate values with NUL byte"
msgstr "acaba els valors amb un octet NUL"
#: builtin/config.c:155
msgid "show variable names only"
msgstr "mostra només els noms de variable"
#: builtin/config.c:156
msgid "respect include directives on lookup"
msgstr "respecta les directives d'inclusió en cercar"
#: builtin/config.c:157
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia "
"d'ordres)"
#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "valor"
#: builtin/config.c:158
msgid "with --get, use default value when missing entry"
msgstr ""
#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr ""
#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr "patró de la clau no vàlid: %s"
#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr ""
"s'ha produït un error en formatar el valor per defecte de la configuració: %s"
#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr "no es pot analitzar el color «%s»"
#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "no s'ha pogut analitzar el valor de color per defecte"
#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr "no és en un directori git"
#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr "no s'admet escriure a stdin"
#: builtin/config.c:502
#, fuzzy
msgid "writing config blobs is not supported"
msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n"
#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
"[user]\n"
"# Please adapt and uncomment the following lines:\n"
"#\tname = %s\n"
"#\temail = %s\n"
msgstr ""
"# Això és el fitxer de configuració del Git de l'usuari.\n"
"[user]\n"
"# Adapteu i descomenteu les línies següents:\n"
"#\tname = %s\n"
"#\temail = %s\n"
#: builtin/config.c:611
msgid "only one config file at a time"
msgstr "només un fitxer de configuració cada cop"
#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--local només es pot usar dins d'un dipòsit git"
#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr "--blob només es pot usar dins d'un dipòsit git"
#: builtin/config.c:638
msgid "$HOME not set"
msgstr "$HOME no està establerta"
#: builtin/config.c:658
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
"section in \"git help worktree\" for details"
msgstr ""
#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
msgstr "--get-color i el tipus de variable són incoherents"
#: builtin/config.c:693
msgid "only one action at a time"
msgstr "només una acció cada cop"
#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only només és aplicable a --list o --get-regexp"
#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
"--show-origin només és aplicable a --get, --get-all, --get-regexp, i --list"
#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr "--default només és aplicable a --get"
#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr "no s'ha pogut llegir el fitxer de configuració «%s»"
#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr "s'ha produït un error processant els fitxers de configuració"
#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr "no hi ha compatibilitat per a l'edició a stdin"
#: builtin/config.c:746
msgid "editing blobs is not supported"
msgstr "no hi ha compatibilitat per l'edició de blobs"
#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "no es pot crear el fitxer de configuració %s"
#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
"no es poden sobreescriure múltiples valors amb un sol valor\n"
" Useu una expressió regular, --add o --replace-all per a canviar %s."
#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr "no existeix la secció: %s"
#: builtin/count-objects.c:90
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<opcions>] [<comissió>...]"
#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr "git describe [<opcions>] --dirty"
#: builtin/describe.c:63
msgid "head"
msgstr "davant per"
#: builtin/describe.c:63
msgid "lightweight"
msgstr "lleuger"
#: builtin/describe.c:63
msgid "annotated"
msgstr "anotat"
#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "l'etiqueta anotada %s no és disponible"
#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'etiqueta anotada %s no té nom incrustat"
#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "l'etiqueta «%s» realment és «%s» aquí"
#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "cap etiqueta coincideix exactament amb «%s»"
#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "s'ha finalitzat la cerca a %s\n"
#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
"Cap etiqueta anotada pot descriure «%s».\n"
"No obstant, hi havia etiquetes no anotades: proveu --tags."
#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
"Cap etiqueta pot descriure «%s».\n"
"Proveu --always, o creeu algunes etiquetes."
#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu comissions travessades\n"
#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
"s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
"s'ha renunciat la cerca a %s\n"
#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "descriu %s\n"
#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "%s no és un nom d'objecte vàlid"
#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s no és una comissió o un blob"
#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "troba l'etiqueta que vingui després de la comissió"
#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr "estratègia de cerca de depuració en stderr"
#: builtin/describe.c:537
msgid "use any ref"
msgstr "usa qualsevol referència"
#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
#: builtin/describe.c:539
msgid "always use long format"
msgstr "sempre usa el format llarg"
#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "només segueix la primera mare"
#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "emet només coincidències exactes"
#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "marca"
#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")"
#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "--long és incompatible amb --abbrev=0"
#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "No s'ha trobat cap nom, no es pot descriure res."
#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty és incompatible amb les comissions"
#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken és incompatible amb les comissions"
#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic"
#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "opció no vàlida: %s"
#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "No és un dipòsit de git"
#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "s'ha donat un objecte no vàlid «%s»."
#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "s'ha donat més de dos blobs: «%s»"
#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "s'ha donat l'objecte no gestionat «%s»."
#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "ha fallat: %d"
#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s"
#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "No es pot llegir l'objecte %s per l'enllaç simbòlic %s"
#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
"els formats de diff combinats ('-c' and '--cc') no són admesos \n"
"en el mode diff per directoris ('-d' and '--dir-diff')."
#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "s'ha deixat un fitxer de l'arbre de treball."
#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existeix un fitxer temporal a «%s»."
#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "podeu netejar o recuperar-los."
#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "fes un diff de tot el directori"
#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "no preguntis abans d'executar l'eina diff"
#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "utilitza enllaços simbòlics en mode dir-diff"
#: builtin/difftool.c:699
msgid "tool"
msgstr "eina"
#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "utilitza l'eina de diff especificada"
#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"imprimeix una llista de totes les eines diff que podeu usar amb `--tool`"
#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de "
"sortida diferent de zero"
#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr "especifiqueu un ordre personalitzat per veure diffs"
#: builtin/difftool.c:709
msgid "passed to `diff`"
msgstr "passa-ho a «diff»"
#: builtin/difftool.c:724
msgid "difftool requires worktree or --no-index"
msgstr "difftool requereix worktree o --no-index"
#: builtin/difftool.c:731
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff és incompatible amb --no-index"
#: builtin/difftool.c:734
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool and --extcmd són mútuament excloents"
#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
#: builtin/env--helper.c:6
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>"
#: builtin/env--helper.c:37 builtin/hash-object.c:98
msgid "type"
msgstr "tipus"
#: builtin/env--helper.c:41
msgid "default for git_env_*(...) to fall back on"
msgstr ""
#: builtin/env--helper.c:43
msgid "be quiet only use git_env_*() value as exit code"
msgstr ""
#: builtin/env--helper.c:62
#, c-format
msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
msgstr ""
#: builtin/env--helper.c:77
#, c-format
msgid ""
"option `--default' expects an unsigned long value with `--type=ulong`, not `"
"%s`"
msgstr ""
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opcions-de-llista-de-revisions]"
#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "mostra el progrés després de <n> objectes"
#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "selecciona la gestió de les etiquetes signades"
#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
#: builtin/fast-export.c:1132
#, fuzzy
msgid "select handling of commit messages in an alternate encoding"
msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Bolca les marques a aquest fitxer"
#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Importa les marques d'aquest fitxer"
#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Imprimeix l'arbre complet de cada comissió"
#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Usa la característica done per a acabar el corrent"
#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Omet l'emissió de dades de blob"
#: builtin/fast-export.c:1145 builtin/log.c:1649
msgid "refspec"
msgstr "especificació de referència"
#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Aplica l'especificació de referència a les referències exportades"
#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "anonimitza la sortida"
#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr ""
#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opcions>] <grup>"
#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]"
#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcions>]"
#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "obtén de tots els remots"
#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "camí al qual pujar el paquet al costat remot"
#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "força la sobreescriptura de la referència local"
#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "obtén de múltiples remots"
#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "obtén totes les etiquetes i tots els objectes associats"
#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "no obtinguis les etiquetes (--no-tags)"
#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "nombre de submòduls obtinguts en paral·lel"
#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot"
#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "sota demanda"
#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "retén el paquet baixat"
#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "permet l'actualització de la referència HEAD"
#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "aprofundeix la història d'un clon superficial"
#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "aprofundeix la història d'un clon superficial basat en temps"
#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "anteposa això a la sortida de camí del submòdul"
#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que "
"els fitxers de configuració)"
#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "accepta les referències que actualitzin .git/shallow"
#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "mapa de referències"
#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "mostra el mapa de referències d'obtenció"
#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr ""
#: builtin/fetch.c:183
#, fuzzy
msgid "run 'gc --auto' after fetching"
msgstr "poda els remots després d'obtenir-los"
#: builtin/fetch.c:185 builtin/pull.c:245
msgid "check for forced-updates on all updated branches"
msgstr ""
#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "No s'ha pogut trobar la referència HEAD remota"
#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "la configuració fetch.output conté un valor no vàlid %s"
#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[al dia]"
#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[rebutjat]"
#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr ""
#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[etiqueta nova]"
#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[branca nova]"
#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[referència nova]"
#: builtin/fetch.c:828
msgid "forced update"
msgstr "actualització forçada"
#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
#: builtin/fetch.c:879
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
#: builtin/fetch.c:900
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
#: builtin/fetch.c:991 builtin/fetch.c:1124
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
#: builtin/fetch.c:1002
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
"algunes referències locals no s'han pogut actualitzar;\n"
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevol branca antiga o conflictiva"
#: builtin/fetch.c:1008
msgid ""
"Fetch normally indicates which branches had a forced update, but that check "
"has been disabled."
msgstr ""
#: builtin/fetch.c:1009
msgid ""
"To re-enable, use '--show-forced-updates' flag or run 'git config fetch."
"showForcedUpdates true'."
msgstr ""
#: builtin/fetch.c:1011
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use '--no-show-forced-"
"updates'\n"
msgstr ""
#: builtin/fetch.c:1013
msgid ""
"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
msgstr ""
#: builtin/fetch.c:1094
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
#: builtin/fetch.c:1095
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
#: builtin/fetch.c:1127
msgid "[deleted]"
msgstr "[suprimit]"
#: builtin/fetch.c:1128 builtin/remote.c:1036
msgid "(none)"
msgstr "(cap)"
#: builtin/fetch.c:1151
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu"
#: builtin/fetch.c:1170
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "L'opció «%s» amb valor «%s» no és vàlida per a %s"
#: builtin/fetch.c:1173
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "S'ignora l'opció «%s» per a %s\n"
#: builtin/fetch.c:1477
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
#: builtin/fetch.c:1479 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
#: builtin/fetch.c:1525
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
msgstr ""
#: builtin/fetch.c:1549
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
"Cap dipòsit remot especificat. Especifiqueu un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
#: builtin/fetch.c:1586
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
#: builtin/fetch.c:1637
msgid "Negative depth in --deepen is not supported"
msgstr "No s'admet una profunditat negativa en --deepen"
#: builtin/fetch.c:1639
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen i --depth són mútuament excloents"
#: builtin/fetch.c:1644
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
#: builtin/fetch.c:1646
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
#: builtin/fetch.c:1662
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
#: builtin/fetch.c:1664
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
#: builtin/fetch.c:1673
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existeix un remot ni un grup remot: %s"
#: builtin/fetch.c:1680
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
#: builtin/fetch.c:1696
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
#: builtin/fmt-merge-msg.c:672
msgid "populate log with at most <n> entries from shortlog"
msgstr "emplena el registre amb <n> entrades del registre curt com a màxim"
#: builtin/fmt-merge-msg.c:675
msgid "alias for --log (deprecated)"
msgstr "àlies per --log (en desús)"
#: builtin/fmt-merge-msg.c:678
msgid "text"
msgstr "text"
#: builtin/fmt-merge-msg.c:679
msgid "use <text> as start of message"
msgstr "usa <text> com a inici de missatge"
#: builtin/fmt-merge-msg.c:680
msgid "file to read from"
msgstr "fitxer del qual llegir"
#: builtin/for-each-ref.c:10
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<opcions>] [<patró>]"
#: builtin/for-each-ref.c:11
msgid "git for-each-ref [--points-at <object>]"
msgstr "git for-each-ref [--points-at <objecte>]"
#: builtin/for-each-ref.c:12
msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr "git for-each-ref [(--merged | --no-merged) [<comissió>]]"
#: builtin/for-each-ref.c:13
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
"git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]"
#: builtin/for-each-ref.c:28
msgid "quote placeholders suitably for shells"
msgstr ""
"posa els marcadors de posició de forma adequada per a intèrprets d'ordres"
#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for perl"
msgstr "posa els marcadors de posició entre cometes adequades per al perl"
#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for python"
msgstr "posa els marcadors de posició entre cometes adequades per al python"
#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for Tcl"
msgstr "posa els marcadors de posició entre cometes adequades per al Tcl"
#: builtin/for-each-ref.c:37
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "respecta els colors del format"
#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "imprimeix només les referències que assenyalin l'objecte donat"
#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "imprimeix només les referències que s'han fusionat"
#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "imprimeix només les referències que no s'han fusionat"
#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "imprimeix només les referències que continguin la comissió"
#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "imprimeix només les referències que no continguin la comissió"
#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
msgid "unknown"
msgstr "desconegut"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
#: builtin/fsck.c:120 builtin/fsck.c:136
#, c-format
msgid "error in %s %s: %s"
msgstr "error en %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
#: builtin/fsck.c:131
#, c-format
msgid "warning in %s %s: %s"
msgstr ""
#: builtin/fsck.c:157 builtin/fsck.c:159
#, c-format
msgid "broken link from %7s %s"
msgstr ""
#: builtin/fsck.c:168
msgid "wrong object type in link"
msgstr "tipus d'objecte incorrecte en l'enllaç"
#: builtin/fsck.c:184
#, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
#: builtin/fsck.c:295
#, c-format
msgid "missing %s %s"
msgstr "manca %s %s"
#: builtin/fsck.c:321
#, c-format
msgid "unreachable %s %s"
msgstr "inabastable %s %s"
#: builtin/fsck.c:340
#, fuzzy, c-format
msgid "dangling %s %s"
msgstr "S'estan actualitzant %s..%s\n"
#: builtin/fsck.c:349
#, fuzzy
msgid "could not create lost-found"
msgstr "no s'ha pogut crear el fitxer «%s»"
#: builtin/fsck.c:360
#, c-format
msgid "could not finish '%s'"
msgstr "no s'ha pogut finalitzar «%s»"
#: builtin/fsck.c:377
#, c-format
msgid "Checking %s"
msgstr "S'està comprovant %s"
#: builtin/fsck.c:415
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "S'està comprovant la connectivitat (%d objectes)"
#: builtin/fsck.c:434
#, c-format
msgid "Checking %s %s"
msgstr "S'està comprovant %s %s"
#: builtin/fsck.c:438
msgid "broken links"
msgstr "enllaços trencats"
#: builtin/fsck.c:447
#, c-format
msgid "root %s"
msgstr "arrel %s"
#: builtin/fsck.c:455
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr ""
#: builtin/fsck.c:484
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: objecte corrupte o no trobat"
#: builtin/fsck.c:509
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr " %s: entrada de referència no vàlida %s"
#: builtin/fsck.c:523
#, fuzzy, c-format
msgid "Checking reflog %s->%s"
msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
#: builtin/fsck.c:557
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: punter sha1 no vàlid: %s"
#: builtin/fsck.c:564
#, c-format
msgid "%s: not a commit"
msgstr "%s: no és una comissió"
#: builtin/fsck.c:619
msgid "notice: No default references"
msgstr "avís: no hi ha referències per defecte"
#: builtin/fsck.c:634
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objecte corrupte o no trobat: %s"
#: builtin/fsck.c:647
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
#: builtin/fsck.c:667
#, c-format
msgid "bad sha1 file: %s"
msgstr "fitxer sha1 malmès: %s"
#: builtin/fsck.c:682
msgid "Checking object directory"
msgstr "S'està comprovant el directori d'objecte"
#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "S'estan comprovant els directoris d'objecte"
#: builtin/fsck.c:700
#, c-format
msgid "Checking %s link"
msgstr "S'està comprovant l'enllaç %s"
#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
#: builtin/fsck.c:712
#, fuzzy, c-format
msgid "%s points to something strange (%s)"
msgstr "%s - no és una cosa que puguem fusionar"
#: builtin/fsck.c:718
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr ""
#: builtin/fsck.c:722
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
#: builtin/fsck.c:734
msgid "Checking cache tree"
msgstr "S'està comprovant l'arbre de la memòria cau"
#: builtin/fsck.c:739
#, fuzzy, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
#: builtin/fsck.c:750
msgid "non-tree in cache-tree"
msgstr ""
#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
#: builtin/fsck.c:789
msgid "report tags"
msgstr "informa de les etiquetes"
#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "fes els objectes d'índex nodes de cap"
#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "mostra el progrés"
#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
#: builtin/fsck.c:887
#, fuzzy, c-format
msgid "%s: object missing"
msgstr "mostra la mida de l'objecte"
#: builtin/fsck.c:899
#, fuzzy, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr "git gc [<opcions>]"
#: builtin/gc.c:90
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "S'ha produït un error en fer fstat %s: %s"
#: builtin/gc.c:126
#, fuzzy, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "s'ha produït un error en moure «%s» a «%s»"
#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "no es pot fer stat en «%s»"
#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "no es pot llegir «%s»"
#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"and remove %s.\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
"L'última execució de gc ha informat el següent. Corregiu\n"
"la causa primordial i elimineu %s.\n"
"No es realitzarà la neteja automàtica fins que s'elimini el fitxer.\n"
"\n"
"%s"
#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "poda objectes sense referència"
#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "habilita el mode de recollida d'escombraries automàtica"
#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr ""
#: builtin/gc.c:566
#, fuzzy, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
#: builtin/gc.c:577
#, fuzzy, c-format
msgid "failed to parse prune expiry value %s"
msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"S'està empaquetant el dipòsit automàticament en el rerefons per a un "
"rendiment òptim.\n"
#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
"S'està empaquetant automàticament el dipòsit per a un rendiment òptim.\n"
#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vegeu «git help gc» per a neteja manual.\n"
#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-"
"los."
#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: s'ha produït un error en crear fil: %s"
#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
#.
#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
#: builtin/pack-objects.c:2722
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hi ha suport de fils, s'està ignorant %s"
#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "no s'ha pogut llegir l'arbre (%s)"
#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "no es pot fer grep des d'un objecte de tipus %s"
#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció «%c» espera un valor numèric"
#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "cerca en l'índex en lloc de l'arbre de treball"
#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "cerca recursivament a cada submòdul"
#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "cerca als subdirectories (per defecte)"
#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX ampliades"
#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
#: builtin/grep.c:855
msgid "show line numbers"
msgstr "mostra els números de línia"
#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "mostra el nombre de columna de la primera coincidència"
#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
#: builtin/grep.c:858
msgid "show filenames"
msgstr "mostra els noms de fitxer"
#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "mostra només els noms de fitxer en lloc de les línies coincidents"
#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "mostra només les parts de coincidents de la línia"
#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "mostra el nombre de coincidències en lloc de les línies coincidents"
#: builtin/grep.c:875
msgid "highlight matches"
msgstr "ressalta les coincidències"
#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"mostra el nom de fitxer només una vegada a dalt de les coincidències del "
"mateix fitxer"
#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "mostra <n> línies de context abans i després d'una coincidència"
#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "usa <n> fils de treball"
#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "mostra una línia amb el nom de funció abans de les coincidències"
#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
"mostra només les coincidències dels fitxers que coincideixin amb tots els "
"patrons"
#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisi de l'expressió grep"
#: builtin/grep.c:922
msgid "pager"
msgstr "paginador"
#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
#: builtin/grep.c:990
msgid "no pattern given"
msgstr "no s'ha donat cap patró"
#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no es pot usar amb revisions"
#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no s'ha pogut resoldre la revisió: %s"
#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "combinació d'opcions no vàlida, s'està ignorant --threads"
#: builtin/grep.c:1068 builtin/pack-objects.c:3405
msgid "no threads support, ignoring --threads"
msgstr "no hi ha suport de fils, s'està ignorant --threads"
#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager només funciona en l'arbre de treball"
#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "opció no admesa amb --recurse-submodules."
#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked no es pot usar amb --no-index."
#: builtin/grep.c:1129
#, fuzzy
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
#: builtin/grep.c:1137
#, fuzzy
msgid "both --cached and trees are given"
msgstr "s'han donat ambdós --caches i arbres."
#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] "
"[--] <fitxer>..."
#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
#: builtin/hash-object.c:98
msgid "object type"
msgstr "tipus d'objecte"
#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "escriu l'objecte a la base de dades d'objectes"
#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "llegeix l'objecte des de stdin"
#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "emmagatzema el fitxer tal com és sense filtres"
#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a "
"depurar al Git"
#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "processa el fitxer com si fos d'aquest camí"
#: builtin/help.c:46
msgid "print all available commands"
msgstr "imprimeix totes les ordres disponibles"
#: builtin/help.c:47
msgid "exclude guides"
msgstr "exclou guies"
#: builtin/help.c:48
msgid "print list of useful guides"
msgstr "imprimeix la llista de guies útils"
#: builtin/help.c:49
#, fuzzy
msgid "print all configuration variable names"
msgstr "no es pot crear el fitxer de configuració %s"
#: builtin/help.c:51
msgid "show man page"
msgstr "mostra la pàgina de manual"
#: builtin/help.c:52
msgid "show manual in web browser"
msgstr "mostra la pàgina de manual en el navegador web"
#: builtin/help.c:54
msgid "show info page"
msgstr "mostra la pàgina d'informació"
#: builtin/help.c:56
#, fuzzy
msgid "print command description"
msgstr "imprimeix els continguts de la comissió"
#: builtin/help.c:61
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'ajuda no reconegut «%s»"
#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "S'ha produït un error en analitzar la versió d'emacsclient."
#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "s'ha produït un error en executar «%s»"
#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
"«%s»: camí a un visualitzador de manuals no compatible.\n"
"Considereu usar 'man.<eina>.cmd' en lloc d'això."
#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
"«%s»: ordre per a un visualitzador de manuals compatible.\n"
"Considereu usar 'man.<eina>.path' en lloc d'això."
#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "«%s»: visualitzador de manuals desconegut."
#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "«%s» és un àlies de «%s»"
#: builtin/help.c:448 git.c:365
#, fuzzy, c-format
msgid "bad alias.%s string: %s"
msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "ús: %s%s"
#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr ""
#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "hi ha una discordança de tipus d'objecte a %s"
#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s"
#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no es pot omplir %d octet"
msgstr[1] "no es pot omplir %d octets"
#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "EOF prematur"
#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "error de lectura d'entrada"
#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
#: builtin/index-pack.c:288 builtin/pack-objects.c:600
msgid "pack too large for current definition of off_t"
msgstr "paquet massa gran per a la definició actual d'off_t"
#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "el paquet supera la mida màxima permesa"
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no es pot obrir el fitxer de paquet «%s»"
#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr ""
"desbordament de valor de desplaçament per a l'objecte base de diferències"
#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "el desplaçament de base de diferències està fora de límits"
#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "no es pot fer pread en el fitxer empaquetat"
#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "el final del fitxer empaquetat és prematur, manca %<PRIuMAX> octet"
msgstr[1] ""
"el final del fitxer empaquetat és prematur, manquen %<PRIuMAX> octets"
#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
#: builtin/index-pack.c:738 builtin/pack-objects.c:153
#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "no es pot llegir la informació d'objecte existent %s"
#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
#: builtin/index-pack.c:826 builtin/index-pack.c:845
#, fuzzy
msgid "fsck error in packed object"
msgstr "ignora els objectes empaquetats"
#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No tots els objectes fills de %s són abastables"
#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "s'ha produït un error en aplicar la diferència"
#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "S'estan resolent les diferències"
#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "s'ha completat amb %d objecte local"
msgstr[1] "s'ha completat amb %d objectes locals"
#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)"
#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "El paquet té %d diferència no resolta"
msgstr[1] "El paquet té %d diferències no resoltes"
#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'"
#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no es pot escriure «%s» al fitxer «%s»"
#: builtin/index-pack.c:1435
#, fuzzy, c-format
msgid "cannot close written %s file '%s'"
msgstr "no es pot tancar el fitxer escrit a mantenir «%s»"
#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "error en tancar el fitxer empaquetat"
#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "no es pot emmagatzemar el fitxer empaquetat"
#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "no es pot emmagatzemar el fitxer d'índex"
#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorrecte"
#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No es pot obrir el fitxer empaquetat existent «%s»"
#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»"
#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "sense diferències: %d objecte"
msgstr[1] "sense diferències: %d objectes"
#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longitud de cadena = %d: %lu objecte"
msgstr[1] "longitud de cadena = %d: %lu objectes"
#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "No es pot tornar al directori de treball actual"
#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "%s incorrecte"
#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no es pot usar sense --stdin"
#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin requereix un dipòsit git"
#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
#, fuzzy
msgid "fsck error in pack objects"
msgstr "error en objecte: %s"
#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "no es pot fer stat en la plantilla «%s»"
#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "no es pot fer opendir en el directori «%s»"
#: builtin/init-db.c:78
#, c-format
msgid "cannot readlink '%s'"
msgstr "no es pot fer readlink en «%s»"
#: builtin/init-db.c:80
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "no es pot fer symlink en «%s» «%s»"
#: builtin/init-db.c:86
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "no es pot copiar «%s» a «%s»"
#: builtin/init-db.c:90
#, c-format
msgid "ignoring template %s"
msgstr "s'està ignorant la plantilla %s"
#: builtin/init-db.c:121
#, fuzzy, c-format
msgid "templates not found in %s"
msgstr "no s'han trobat les plantilles %s"
#: builtin/init-db.c:136
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "no s'estan copiant plantilles de «%s»: %s"
#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "no s'ha pogut moure %s a %s"
#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s ja existeix"
#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el dipòsit compartit existent del Git en %s%s\n"
#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el dipòsit existent del Git en %s%s\n"
#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "S'ha inicialitzat un dipòsit compartit buit del Git en %s%s\n"
#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "S'ha inicialitzat un dipòsit buit del Git en %s%s\n"
#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
"shared[=<permisos>]] [<directori>]"
#: builtin/init-db.c:491
msgid "permissions"
msgstr "permisos"
#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris"
#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "no es pot mkdir %s"
#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "no es pot canviar de directori a %s"
#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
"dir=<directori>)"
#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No es pot accedir a l'arbre de treball «%s»"
#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<testimoni>[(=|:)<valor>])...] [<fitxer>...]"
#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "edita els fitxers in situ"
#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "escurça els remolcs buits"
#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "on ubica"
#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "acció si el «trailer» ja existeix"
#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "acció si el «trailer» falta"
#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "mostra només els «trailer»"
#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "no apliquis les regles de configuració"
#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "uneix els valors continus amb espais en blanc"
#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "estableix les opcions d'anàlisi"
#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr ""
#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "remolc"
#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "remolcs a afegir"
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer amb --only-input no té sentit"
#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr "git show [<opcions>] <objecte>..."
#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opció --decorate no vàlida: %s"
#: builtin/log.c:160
msgid ""
"log.mailmap is not set; its implicit value will change in an\n"
"upcoming release. To squelch this message and preserve current\n"
"behaviour, set the log.mailmap configuration value to false.\n"
"\n"
"To squelch this message and adopt the new behaviour now, set the\n"
"log.mailmap configuration value to true.\n"
"\n"
"See 'git help config' and search for 'log.mailmap' for further information."
msgstr ""
#: builtin/log.c:183
msgid "show source"
msgstr "mostra la font"
#: builtin/log.c:184
msgid "Use mail map file"
msgstr "Usa el fitxer de mapa de correu"
#: builtin/log.c:186
msgid "only decorate refs that match <pattern>"
msgstr "només decora les referències que coincideixin amb <patró>"
#: builtin/log.c:188
msgid "do not decorate refs that match <pattern>"
msgstr "no decoris les referències que coincideixen amb <patró>"
#: builtin/log.c:189
msgid "decorate options"
msgstr "opcions de decoració"
#: builtin/log.c:192
msgid "Process line range n,m in file, counting from 1"
msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1"
#: builtin/log.c:297
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortida final: %d %s\n"
#: builtin/log.c:551
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: fitxer incorrecte"
#: builtin/log.c:566 builtin/log.c:660
#, fuzzy, c-format
msgid "could not read object %s"
msgstr "No es pot llegir l'objecte %s"
#: builtin/log.c:685
#, fuzzy, c-format
msgid "unknown type: %d"
msgstr "Tipus desconegut: %d"
#: builtin/log.c:808
msgid "format.headers without value"
msgstr "format.headers sense valor"
#: builtin/log.c:925
msgid "name of output directory is too long"
msgstr "el nom del directori de sortida és massa llarg"
#: builtin/log.c:941
#, fuzzy, c-format
msgid "cannot open patch file %s"
msgstr "No es pot obrir el fitxer de pedaç %s"
#: builtin/log.c:958
#, fuzzy
msgid "need exactly one range"
msgstr "Cal exactament un rang."
#: builtin/log.c:968
#, fuzzy
msgid "not a range"
msgstr "No és un rang."
#: builtin/log.c:1091
#, fuzzy
msgid "cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
#: builtin/log.c:1097
#, fuzzy
msgid "failed to create cover-letter file"
msgstr "S'ha produït un error en crear els fitxers de sortida"
#: builtin/log.c:1176
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
#: builtin/log.c:1203
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
#: builtin/log.c:1261
#, fuzzy
msgid "two output directories?"
msgstr "Hi ha dos directoris de sortida?"
#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
#, fuzzy, c-format
msgid "unknown commit %s"
msgstr "Comissió desconeguda %s"
#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida"
#: builtin/log.c:1387
#, fuzzy
msgid "could not find exact merge base"
msgstr "No s'ha pogut trobar la base exacta de fusió."
#: builtin/log.c:1391
#, fuzzy
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
"S'ha produït un error en obtenir la font. Si voleu registrar la comissió "
"base\n"
"automàticament, useu git branch --set-upstream-to per a\n"
"seguir una branca remota. O podeu especificar la comissió base manualment\n"
"amb --base=<id-de-comissió-base>."
#: builtin/log.c:1411
#, fuzzy
msgid "failed to find exact merge base"
msgstr "S'ha produït un error en trobar la base exacta de fusió."
#: builtin/log.c:1422
msgid "base commit should be the ancestor of revision list"
msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions"
#: builtin/log.c:1426
msgid "base commit shouldn't be in revision list"
msgstr "la comissió base no ha de ser en la llista de revisions"
#: builtin/log.c:1479
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
#: builtin/log.c:1531
#, fuzzy
msgid "failed to infer range-diff ranges"
msgstr "s'ha produït un error en executar «%s»"
#: builtin/log.c:1576
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
#: builtin/log.c:1579
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
#: builtin/log.c:1583
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
#: builtin/log.c:1585
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
#: builtin/log.c:1587
msgid "use simple number sequence for output file names"
msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
#: builtin/log.c:1588
msgid "sfx"
msgstr "sufix"
#: builtin/log.c:1589
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
#: builtin/log.c:1591
msgid "start numbering patches at <n> instead of 1"
msgstr "comença numerant els pedaços a <n> en lloc d'1"
#: builtin/log.c:1593
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
#: builtin/log.c:1595
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
#: builtin/log.c:1598
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
#: builtin/log.c:1601
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
#: builtin/log.c:1604
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
#: builtin/log.c:1607
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
#: builtin/log.c:1609
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
#: builtin/log.c:1611
msgid "don't include a patch matching a commit upstream"
msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
#: builtin/log.c:1613
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
#: builtin/log.c:1615
msgid "Messaging"
msgstr "Missatgeria"
#: builtin/log.c:1616
msgid "header"
msgstr "capçalera"
#: builtin/log.c:1617
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
#: builtin/log.c:1618 builtin/log.c:1620
msgid "email"
msgstr "correu electrònic"
#: builtin/log.c:1618
msgid "add To: header"
msgstr "afegeix la capçalera To:"
#: builtin/log.c:1620
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
#: builtin/log.c:1622
msgid "ident"
msgstr "identitat"
#: builtin/log.c:1623
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
#: builtin/log.c:1625
msgid "message-id"
msgstr "ID de missatge"
#: builtin/log.c:1626
msgid "make first mail a reply to <message-id>"
msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>"
#: builtin/log.c:1627 builtin/log.c:1630
msgid "boundary"
msgstr "límit"
#: builtin/log.c:1628
msgid "attach the patch"
msgstr "adjunta el pedaç"
#: builtin/log.c:1631
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
#: builtin/log.c:1635
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
#: builtin/log.c:1637
msgid "signature"
msgstr "signatura"
#: builtin/log.c:1638
msgid "add a signature"
msgstr "afegeix una signatura"
#: builtin/log.c:1639
msgid "base-commit"
msgstr "comissió base"
#: builtin/log.c:1640
msgid "add prerequisite tree info to the patch series"
msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços"
#: builtin/log.c:1642
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
#: builtin/log.c:1643
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
#: builtin/log.c:1645
msgid "show progress while generating patches"
msgstr "mostra el progrés durant la generació de pedaços"
#: builtin/log.c:1647
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
#: builtin/log.c:1650
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
#: builtin/log.c:1652
msgid "percentage by which creation is weighted"
msgstr ""
#: builtin/log.c:1727
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
#: builtin/log.c:1742
#, fuzzy
msgid "-n and -k are mutually exclusive"
msgstr "-n i -k són mútuament excloents."
#: builtin/log.c:1744
#, fuzzy
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc i -k són mútuament excloents."
#: builtin/log.c:1752
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
#: builtin/log.c:1754
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
#: builtin/log.c:1756
msgid "--check does not make sense"
msgstr "--check no té sentit"
#: builtin/log.c:1788
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
#: builtin/log.c:1877
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
#: builtin/log.c:1881
msgid "Interdiff:"
msgstr ""
#: builtin/log.c:1882
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
#: builtin/log.c:1888
msgid "--creation-factor requires --range-diff"
msgstr ""
#: builtin/log.c:1892
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
#: builtin/log.c:1900
msgid "Range-diff:"
msgstr ""
#: builtin/log.c:1901
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
#: builtin/log.c:1912
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
#: builtin/log.c:1948
msgid "Generating patches"
msgstr "S'estan generant els pedaços"
#: builtin/log.c:1992
#, fuzzy
msgid "failed to create output files"
msgstr "S'ha produït un error en crear els fitxers de sortida"
#: builtin/log.c:2051
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
#: builtin/log.c:2105
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
"No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> "
"manualment.\n"
#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcions>] [<fitxer>...]"
#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "identifica l'estat de fitxer amb etiquetes"
#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usa lletres minúscules per als fitxers 'fsmonitor clean'"
#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr ""
"mostra en la sortida els fitxers desats en la memòria cau (per defecte)"
#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "mostra en la sortida els fitxers suprimits"
#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "mostra en la sortida els fitxers modificats"
#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "mostra en la sortida els altres fitxers"
#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "mostra en la sortida els fitxers ignorats"
#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr "mostra en la sortida el nom d'objecte dels continguts «stage»"
#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar"
#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "mostra només els noms dels directoris 'other'"
#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "mostra els terminadors de línia dels fitxers"
#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "no mostris els directoris buits"
#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "mostra en la sortida els fitxers sense fusionar"
#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "mostra la informació de resolució de desfet"
#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "omet els fitxers coincidents amb el patró"
#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "afegeix les exclusions estàndards de git"
#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "fes que la sortida sigui relativa al directori superior del projecte"
#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "inclou recursivament als submòduls"
#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error"
#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "arbre"
#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"pretén que els camins eliminats després de <arbre> encara siguin presents"
#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "mostra les dades de depuració"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs]\n"
" [--upload-pack=<executable>] [-q | --quiet]\n"
" [--exit-code] [--get-url] [--symref]\n"
" [<dipòsit> [<referències>...]]"
#: builtin/ls-remote.c:59
msgid "do not print remote URL"
msgstr "no imprimeixis l'URL remot"
#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "executable"
#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
msgid "path of git-upload-pack on the remote host"
msgstr "camí a git-upload-pack en la màquina remota"
#: builtin/ls-remote.c:65
msgid "limit to tags"
msgstr "limita a etiquetes"
#: builtin/ls-remote.c:66
msgid "limit to heads"
msgstr "limita a caps"
#: builtin/ls-remote.c:67
msgid "do not show peeled tags"
msgstr "no mostris les etiquetes pelades"
#: builtin/ls-remote.c:69
msgid "take url.<base>.insteadOf into account"
msgstr "tingues en compte url.<base>.insteadOf"
#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident"
#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "mostra la referència subjacent a més de l'objecte que senyali"
#: builtin/ls-tree.c:30
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<opcions>] <arbre> [<camí>...]"
#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "mostra només els arbres"
#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "inclou recursivament als subarbres"
#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "mostra els arbres quan es treballa recursivament"
#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "acaba les entrades amb un octet NUL"
#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "mida de l'objecte d'inclusió"
#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "llista només els noms de fitxer"
#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "usa els noms de camí complets"
#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"llista l'arbre sencer; no només el directori actual (implica --full-name)"
#: builtin/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox buit: «%s»"
#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcions>] [<comissió>...]"
#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "l'opció «m» requereix un valor"
#: builtin/merge.c:141
#, fuzzy, c-format
msgid "option `%s' requires a value"
msgstr "l'opció «%s» requereix un valor"
#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n"
#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Les estratègies disponibles són:"
#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "no mostris les estadístiques de diferència al final de la fusió"
#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "mostra les estadístiques de diferència al final de la fusió"
#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió "
"de fusió"
#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "crea una única comissió en lloc de fusionar"
#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "realitza una comissió si la fusió té èxit (per defecte)"
#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "avorta si l'avanç ràpid no és possible"
#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida"
#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "estratègia"
#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "opció=valor"
#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)"
#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
#: builtin/merge.c:280
#, fuzzy
msgid "--abort but leave index and working tree alone"
msgstr "restableix HEAD, l'índex i l'arbre de treball"
#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "continua la fusió en curs actual"
#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "permet fusionar històries no relacionades"
#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "verifica el lligam de missatge de comissió"
#: builtin/merge.c:307
msgid "could not run stash."
msgstr "no s'ha pogut executar «stash»."
#: builtin/merge.c:312
msgid "stash failed"
msgstr "l'«stash» ha fallat"
#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "no és un objecte vàlid: %s"
#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree ha fallat"
#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (res a fer «squash»)"
#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "«%s» no assenyala una comissió"
#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "No s'està gestionant res a part de la fusió de dos caps."
#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opció desconeguda de merge-recursive: -X%s"
#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "no s'ha pogut escriure %s"
#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "No s'ha pogut llegir de «%s»"
#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n"
#: builtin/merge.c:804
#, fuzzy
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
msgstr ""
"Introduïu un missatge de comissió per a explicar per què\n"
"aquesta fusió és necessària, especialment si fusiona una font\n"
"actualitzada a una branca temàtica.\n"
"\n"
"S'ignoraran les línies que comencin amb «%c», i un missatge buit\n"
"avorta la comissió.\n"
#: builtin/merge.c:809
#, fuzzy
msgid "An empty message aborts the commit.\n"
msgstr "edita el missatge abans de cometre"
#: builtin/merge.c:812
#, fuzzy, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
"Introduïu el missatge de comissió dels vostres canvis.\n"
"S'ignoraran les línies que comencin amb «%c», i un missatge de\n"
"comissió buit avorta la comissió.\n"
#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "El missatge de comissió és buit."
#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Meravellós.\n"
#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "
"resultat.\n"
#: builtin/merge.c:972
msgid "No current branch."
msgstr "No hi ha cap branca actual."
#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "No hi ha cap remot per a la branca actual."
#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "No hi ha cap font per defecte definida per a la branca actual."
#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor incorrecte «%s» en l'entorn «%s»"
#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "no és quelcom que puguem fusionar en %s: %s"
#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "no és quelcom que puguem fusionar"
#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort no accepta paràmetres"
#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
#: builtin/merge.c:1291
#, fuzzy
msgid "--quit expects no arguments"
msgstr "--abort no accepta paràmetres"
#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue no accepta paràmetres"
#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
"Cometeu els vostres canvis abans de fusionar."
#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
"No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
"Cometeu els vostres canvis abans de fusionar."
#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)."
#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "No podeu combinar --squash amb --no-ff."
#: builtin/merge.c:1350
#, fuzzy
msgid "You cannot combine --squash with --commit."
msgstr "No podeu combinar --squash amb --no-ff."
#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hi ha una comissió especificada i merge.defaultToUpstream no està "
"establert."
#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit"
#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "Es pot fusionar només una comissió a un HEAD buit"
#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "s'està refusant fusionar històries no relacionades"
#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Ja està al dia."
#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "S'està intentant una fusió molt trivial en l'índex...\n"
#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Ja està al dia. Estupend!"
#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "No és possible avançar ràpidament, s'està avortant."
#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "S'està rebobinant l'arbre a la pristina...\n"
#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "S'està intentant l'estratègia de fusió %s...\n"
#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia "
"demanat\n"
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr "git merge-base [-a | --all] <comissió> <comissió>..."
#: builtin/merge-base.c:33
msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr "git merge-base [-a | --all] --octopus <comissió>..."
#: builtin/merge-base.c:34
msgid "git merge-base --independent <commit>..."
msgstr "git merge-base --independent <comissió>..."
#: builtin/merge-base.c:35
msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr "git merge-base --is-ancestor <comissió> <comissió>"
#: builtin/merge-base.c:36
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <referència> [<comissió>]"
#: builtin/merge-base.c:153
msgid "output all common ancestors"
msgstr "emet tots els avantpassats comuns"
#: builtin/merge-base.c:155
msgid "find ancestors for a single n-way merge"
msgstr "troba els avantpassats per a una sola fusió d'n vies"
#: builtin/merge-base.c:157
msgid "list revs not reachable from others"
msgstr "llista les revisions no abastables d'altres"
#: builtin/merge-base.c:159
msgid "is the first one ancestor of the other?"
msgstr "és la primera un avantpassat de l'altre?"
#: builtin/merge-base.c:161
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
"troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
#: builtin/merge-file.c:9
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
msgstr ""
"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> "
"<fitxer-original> <fitxer2>"
#: builtin/merge-file.c:35
msgid "send results to standard output"
msgstr "envia els resultats a la sortida estàndard"
#: builtin/merge-file.c:36
msgid "use a diff3 based merge"
msgstr "usa una fusió basada en diff3"
#: builtin/merge-file.c:37
msgid "for conflicts, use our version"
msgstr "en conflictes, usa la nostra versió"
#: builtin/merge-file.c:39
msgid "for conflicts, use their version"
msgstr "en conflictes, usa la seva versió"
#: builtin/merge-file.c:41
msgid "for conflicts, use a union version"
msgstr "en conflictes, usa una versió d'unió"
#: builtin/merge-file.c:44
msgid "for conflicts, use this marker size"
msgstr "en conflictes, usa aquesta mida de marcador"
#: builtin/merge-file.c:45
msgid "do not warn about conflicts"
msgstr "no avisis de conflictes"
#: builtin/merge-file.c:47
msgid "set labels for file1/orig-file/file2"
msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "opció desconeguda %s"
#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "no s'ha pogut analitzar l'objecte «%s»"
#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] "no es pot gestionar més d'%d base. S'està ignorant %s."
msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s."
#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr "no s'està gestionant res a part de la fusió de dos caps."
#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr "no s'ha pogut resoldre la referència «%s»"
#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "S'està fusionant %s amb %s\n"
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "l'entrada és acabada amb NUL"
#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "permet els objectes absents"
#: builtin/mktree.c:156
msgid "allow creation of more than one tree"
msgstr "permet la creació de més d'un arbre"
#: builtin/multi-pack-index.c:9
msgid ""
"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
"batch-size=<size>)"
msgstr ""
#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
#: builtin/multi-pack-index.c:25
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr ""
#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "hi ha massa paràmetres"
#: builtin/multi-pack-index.c:52
msgid "--batch-size option is only for 'repack' subcommand"
msgstr ""
#: builtin/multi-pack-index.c:61
#, fuzzy, c-format
msgid "unrecognized subcommand: %s"
msgstr "subordre desconeguda: %s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opcions>] <font>... <destí>"
#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "El directori %s és en l'índex i no hi ha cap submòdul?"
#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
"per a procedir"
#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s és en l'índex"
#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "força el moviment / canvi de nom encara que el destí existeixi"
#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "omet els errors de moviment / canvi de nom"
#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "el destí «%s» no és un directori"
#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
#: builtin/mv.c:184
msgid "bad source"
msgstr "font incorrecta"
#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "no es pot moure un directori a dins d'ell mateix"
#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "no es pot moure un directori sobre un fitxer"
#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "el directori font està buit"
#: builtin/mv.c:224
msgid "not under version control"
msgstr "no està sota control de versions"
#: builtin/mv.c:227
msgid "destination exists"
msgstr "el destí existeix"
#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "s'està sobreescrivint «%s»"
#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "No es pot sobreescriure"
#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "múltiples fonts per al mateix destí"
#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "el directori destí no existeix"
#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, origen=%s, destí=%s"
#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "S'està canviant el nom de %s a %s\n"
#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "el canvi del nom de «%s» ha fallat"
#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opcions>] --stdin"
#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "imprimeix només els noms (sense SHA-1)"
#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "només usa les etiquetes per a anomenar les comissions"
#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "només usa les referències que coincideixin amb <patró>"
#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignora les referències que coincideixin amb <patró>"
#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "llista totes les comissions abastables de totes les referències"
#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "llegeix de stdin"
#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "permet imprimir els noms `undefined` (per defecte)"
#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "desreferencia les etiquetes en l'entrada (ús intern)"
#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]"
#: builtin/notes.c:29
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m "
"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
"git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>"
#: builtin/notes.c:31
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m "
"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
#: builtin/notes.c:32
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
"git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]"
#: builtin/notes.c:33
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr "git notes [--ref <referència-de-notes>] show [<objecte>]"
#: builtin/notes.c:34
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] "
"<referència-de-notes>"
#: builtin/notes.c:35
msgid "git notes merge --commit [-v | -q]"
msgstr "git notes merge --commit [-v | -q]"
#: builtin/notes.c:36
msgid "git notes merge --abort [-v | -q]"
msgstr "git notes merge --abort [-v | -q]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <referència-de-notes>] remove [<objecte>...]"
#: builtin/notes.c:38
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr "git notes [--ref <referència-de-notes>] prune [-n] [-v]"
#: builtin/notes.c:39
msgid "git notes [--ref <notes-ref>] get-ref"
msgstr "git notes [--ref <referència-de-notes>] get-ref"
#: builtin/notes.c:44
msgid "git notes [list [<object>]]"
msgstr "git notes [llista [<objecte>]]"
#: builtin/notes.c:49
msgid "git notes add [<options>] [<object>]"
msgstr "git notes add [<opcions>] [<objecte>]"
#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr "git notes copy [<opcions>] <d'objecte> <a-objecte>"
#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr "git notes copy --stdin [<d'objecte> <a-objecte>]..."
#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
msgstr "git notes append [<opcions>] [<objecte>]"
#: builtin/notes.c:65
msgid "git notes edit [<object>]"
msgstr "git notes edit [<objecte>]"
#: builtin/notes.c:70
msgid "git notes show [<object>]"
msgstr "git notes show [<objecte>]"
#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
msgstr "git notes merge [<opcions>] <referència-de-notes>"
#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
msgstr "git notes merge --commit [<opcions>]"
#: builtin/notes.c:77
msgid "git notes merge --abort [<options>]"
msgstr "git notes merge --abort [<opcions>]"
#: builtin/notes.c:82
msgid "git notes remove [<object>]"
msgstr "git notes remove [<objecte>]"
#: builtin/notes.c:87
msgid "git notes prune [<options>]"
msgstr "git notes prune [<opcions>]"
#: builtin/notes.c:92
msgid "git notes get-ref"
msgstr "git notes get-ref"
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "Escriviu/editeu les notes per l'objecte següent:"
#: builtin/notes.c:150
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "no s'ha pogut iniciar 'show' per a l'objecte «%s»"
#: builtin/notes.c:154
msgid "could not read 'show' output"
msgstr "no s'ha pogut llegir la sortida de 'show'"
#: builtin/notes.c:162
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte «%s»"
#: builtin/notes.c:197
msgid "please supply the note contents using either -m or -F option"
msgstr ""
"especifiqueu el contingut de la nota fent servir l'opció -m o l'opció -F"
#: builtin/notes.c:206
msgid "unable to write note object"
msgstr "no s'ha pogut escriure l'objecte de nota"
#: builtin/notes.c:208
#, c-format
msgid "the note contents have been left in %s"
msgstr "s'han deixat els continguts de la nota en %s"
#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "no s'ha pogut obrir o llegir «%s»"
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida."
#: builtin/notes.c:265
#, c-format
msgid "failed to read object '%s'."
msgstr "s'ha produït un error en llegir l'objecte «%s»."
#: builtin/notes.c:268
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "no es poden llegir les dades de node de l'objecte no de blob «%s»."
#: builtin/notes.c:309
#, c-format
msgid "malformed input line: '%s'."
msgstr "línia d'entrada mal formada: «%s»."
#: builtin/notes.c:324
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
#: builtin/notes.c:356
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)"
#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
msgid "too many parameters"
msgstr "massa paràmetres"
#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "no s'ha trobat cap nota per a l'objecte %s."
#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "anota els continguts com a cadena"
#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "reusa l'objecte de nota especificat"
#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "permet l'emmagatzematge d'una nota buida"
#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "reemplaça les notes existents"
#: builtin/notes.c:448
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "S'està eliminant la nota de l'objecte %s\n"
#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "llegeix els objectes des de stdin"
#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
#: builtin/notes.c:517
msgid "too few parameters"
msgstr "hi ha massa pocs paràmetres"
#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "manquen notes a l'objecte font %s. No es pot copiar."
#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
"Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n"
"Useu «git notes add -f -m/-F/-c/-C» en lloc d'això.\n"
#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL"
#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF"
#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
"s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'"
#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL"
#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "s'ha produït un error en finalitzar la fusió de notes"
#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratègia de fusió de notes desconeguda %s"
#: builtin/notes.c:784
msgid "General options"
msgstr "Opcions generals"
#: builtin/notes.c:786
msgid "Merge options"
msgstr "Opcions de fusió"
#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
"union/cat_sort_uniq)"
#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "S'estan cometent les notes sense fusionar"
#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "S'està avortant la resolució de fusió de notes"
#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "avorta la fusió de notes"
#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no es pot combinar --commit, --abort i -s/--strategy"
#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "cal especificar una referència de notes a fusionar"
#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconeguda: %s"
#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "una fusió de notes a %s ja està en curs a %s"
#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes "
"actual (%s)"
#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"'git notes merge --commit', or abort the merge with 'git notes merge --"
"abort'.\n"
msgstr ""
"La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i "
"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
"'git notes merge --abort'.\n"
#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida."
#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objecte %s no té cap nota\n"
#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "l'intent d'eliminar una nota no existent no és un error"
#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "informa de notes podades"
#: builtin/notes.c:998
msgid "notes-ref"
msgstr "referència de notes"
#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "subordre desconeguda: %s"
#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < "
"<llista-de-objectes>]"
#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < "
"<llista-de-objectes>]"
#: builtin/pack-objects.c:424
#, fuzzy, c-format
msgid "bad packed object CRC for %s"
msgstr "ignora els objectes empaquetats"
#: builtin/pack-objects.c:435
#, fuzzy, c-format
msgid "corrupt packed object for %s"
msgstr "ignora els objectes empaquetats"
#: builtin/pack-objects.c:566
#, fuzzy, c-format
msgid "recursive delta detected for object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
#: builtin/pack-objects.c:777
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
#: builtin/pack-objects.c:790
#, fuzzy, c-format
msgid "packfile is invalid: %s"
msgstr "%s no vàlid"
#: builtin/pack-objects.c:794
#, fuzzy, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "no s'ha pogut obrir o llegir %s"
#: builtin/pack-objects.c:798
#, fuzzy
msgid "unable to seek in reused packfile"
msgstr "no es pot llegir el fitxer d'índex"
#: builtin/pack-objects.c:809
#, fuzzy
msgid "unable to read from reused packfile"
msgstr "no es pot llegir el fitxer d'índex"
#: builtin/pack-objects.c:837
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
"a causa de pack.packSizeLimit"
#: builtin/pack-objects.c:850
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
#: builtin/pack-objects.c:912 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "s'ha produït un error en fer stat a %s"
#: builtin/pack-objects.c:965
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
#: builtin/pack-objects.c:1161
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
"s'empaqueten"
#: builtin/pack-objects.c:1591
#, fuzzy, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "el desplaçament de base de diferències està fora de límits"
#: builtin/pack-objects.c:1600
#, fuzzy, c-format
msgid "delta base offset out of bound for %s"
msgstr "el desplaçament de base de diferències està fora de límits"
#: builtin/pack-objects.c:1869
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
#: builtin/pack-objects.c:1999
#, fuzzy, c-format
msgid "unable to get size of %s"
msgstr "no s'ha pogut moure %s a %s"
#: builtin/pack-objects.c:2014
#, fuzzy, c-format
msgid "unable to parse object header of %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100
#: builtin/pack-objects.c:2110
#, fuzzy, c-format
msgid "object %s cannot be read"
msgstr "objecte %s no trobat"
#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
#: builtin/pack-objects.c:2124
msgid "suboptimal pack - out of memory"
msgstr ""
#: builtin/pack-objects.c:2450
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
#: builtin/pack-objects.c:2582
#, fuzzy, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "inclou els objectes abastables de qualsevol referència"
#: builtin/pack-objects.c:2669
msgid "Compressing objects"
msgstr "S'estan comprimint els objectes"
#: builtin/pack-objects.c:2675
msgid "inconsistency with delta count"
msgstr ""
#: builtin/pack-objects.c:2756
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
#: builtin/pack-objects.c:2860
msgid "invalid value for --missing"
msgstr "valor no vàlid per a --missing"
#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027
#, fuzzy
msgid "cannot open pack index"
msgstr "no es pot fer pread en el fitxer de paquet"
#: builtin/pack-objects.c:2950
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
#: builtin/pack-objects.c:3035
#, fuzzy
msgid "unable to force loose object"
msgstr "no s'ha pogut escriure l'objecte de nota"
#: builtin/pack-objects.c:3127
#, fuzzy, c-format
msgid "not a rev '%s'"
msgstr "no es pot llegir «%s»"
#: builtin/pack-objects.c:3130
#, c-format
msgid "bad revision '%s'"
msgstr "revisió incorrecte «%s»"
#: builtin/pack-objects.c:3155
msgid "unable to add recent objects"
msgstr "no s'han pogut afegir els objectes recents"
#: builtin/pack-objects.c:3208
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
#: builtin/pack-objects.c:3212
#, c-format
msgid "bad index version '%s'"
msgstr "versió d'índex incorrecta «%s»"
#: builtin/pack-objects.c:3242
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
#: builtin/pack-objects.c:3244
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
#: builtin/pack-objects.c:3246
msgid "show progress meter during object writing phase"
msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
#: builtin/pack-objects.c:3249
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
#: builtin/pack-objects.c:3250
msgid "<version>[,<offset>]"
msgstr "<versió>[,<desplaçament>]"
#: builtin/pack-objects.c:3251
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escriu el fitxer d'índex de paquet en la versió de format d'índex "
"especificada"
#: builtin/pack-objects.c:3254
msgid "maximum size of each output pack file"
msgstr "mida màxima de cada fitxer empaquetat de sortida"
#: builtin/pack-objects.c:3256
msgid "ignore borrowed objects from alternate object store"
msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
#: builtin/pack-objects.c:3258
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
#: builtin/pack-objects.c:3260
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
#: builtin/pack-objects.c:3262
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limita la finestra d'empaquetament per memòria a més del límit d'objectes"
#: builtin/pack-objects.c:3264
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longitud màxima de la cadena de diferències permesa en el paquet resultant"
#: builtin/pack-objects.c:3266
msgid "reuse existing deltas"
msgstr "reusa les diferències existents"
#: builtin/pack-objects.c:3268
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
#: builtin/pack-objects.c:3270
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
#: builtin/pack-objects.c:3272
msgid "use threads when searching for best delta matches"
msgstr "usa fils en cercar les millores coincidències de diferències"
#: builtin/pack-objects.c:3274
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
#: builtin/pack-objects.c:3276
msgid "read revision arguments from standard input"
msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
#: builtin/pack-objects.c:3278
msgid "limit the objects to those that are not yet packed"
msgstr "limita els objectes als quals encara no s'hagin empaquetat"
#: builtin/pack-objects.c:3281
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevol referència"
#: builtin/pack-objects.c:3284
msgid "include objects referred by reflog entries"
msgstr ""
"inclou els objectes als quals facin referència les entrades del registre de "
"referències"
#: builtin/pack-objects.c:3287
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
#: builtin/pack-objects.c:3290
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
#: builtin/pack-objects.c:3292
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
#: builtin/pack-objects.c:3294
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
#: builtin/pack-objects.c:3296
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
#: builtin/pack-objects.c:3298
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaqueta els objectes inabastables més nous que <hora>"
#: builtin/pack-objects.c:3301
msgid "use the sparse reachability algorithm"
msgstr ""
#: builtin/pack-objects.c:3303
msgid "create thin packs"
msgstr "crea paquets prims"
#: builtin/pack-objects.c:3305
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
#: builtin/pack-objects.c:3307
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
#: builtin/pack-objects.c:3309
#, fuzzy
msgid "ignore this pack"
msgstr "usa el paquet prim"
#: builtin/pack-objects.c:3311
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
#: builtin/pack-objects.c:3313
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
#: builtin/pack-objects.c:3315
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usa un índex de mapa de bits, si està disponible, per a accelerar el "
"recompte d'objectes"
#: builtin/pack-objects.c:3317
msgid "write a bitmap index together with the pack index"
msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet"
#: builtin/pack-objects.c:3320
msgid "handling for missing objects"
msgstr "gestió dels objectes absents"
#: builtin/pack-objects.c:3323
msgid "do not pack objects in promisor packfiles"
msgstr ""
#: builtin/pack-objects.c:3325
#, fuzzy
msgid "respect islands during delta compression"
msgstr "mida de la finestra que s'usa per a compressió de diferències"
#: builtin/pack-objects.c:3350
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
#: builtin/pack-objects.c:3355
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
#: builtin/pack-objects.c:3409
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
#: builtin/pack-objects.c:3411
msgid "minimum pack size limit is 1 MiB"
msgstr ""
#: builtin/pack-objects.c:3416
#, fuzzy
msgid "--thin cannot be used to build an indexable pack"
msgstr "--fix-thin no es pot usar sense --stdin"
#: builtin/pack-objects.c:3419
#, fuzzy
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable i -A són incompatibles"
#: builtin/pack-objects.c:3425
#, fuzzy
msgid "cannot use --filter without --stdout"
msgstr "no es pot usar -a amb -d"
#: builtin/pack-objects.c:3486
msgid "Enumerating objects"
msgstr "S'estan enumerant els objectes"
#: builtin/pack-objects.c:3516
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
"Total %<PRIu32> (diferències %<PRIu32>), reusat %<PRIu32> (diferències "
"%<PRIu32>)"
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<opcions>]"
#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "empaqueta-ho tot"
#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "poda les referències soltes (per defecte)"
#: builtin/prune-packed.c:9
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
#: builtin/prune-packed.c:42
msgid "Removing duplicate objects"
msgstr "S'estan eliminant objectes duplicats"
#: builtin/prune.c:12
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <hora>] [--] [<head>...]"
#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "informa d'objectes podats"
#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "fes caducar els objectes més vells que <hora>"
#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "no es pot podar en un dipòsit d'objectes preciosos"
#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valor no vàlid per a %s: %s"
#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Opcions relacionades amb fusionar"
#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Opcions relacionades amb obtenir"
#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "força la sobreescriptura de la branca local"
#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "nombre de submòduls baixats en paral·lel"
#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor no vàlid per a pull.ff: %s"
#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
"acabeu d'obtenir."
#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
"Generalment això vol dir que heu proveït una especificació de\n"
"referència de comodí que no tenia cap coincidència en el costat remot."
#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"a branch. Because this is not the default configured remote\n"
"for your current branch, you must specify a branch on the command line."
msgstr ""
"Heu demanat baixar del remot «%s», però no heu especificat cap branca.\n"
"Perquè aquest no és el remot configurat per defecte per a la vostra\n"
"branca actual, heu d'especificar una branca en la línia d'ordres."
#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Especifiqueu sobre què branca voleu fer «rebase»."
#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Especifiqueu amb quina branca voleu fusionar."
#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Vegeu git-pull(1) per detalls."
#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remot>"
#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branca>"
#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "No hi ha cap informació de seguiment per a la branca actual."
#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
"amb:"
#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
"La vostra configuració especifica fusionar amb la referència «%s»\n"
"del remot, però no s'ha obtingut tal referència."
#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "no s'ha pogut accedir a la comissió %s"
#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures en fer «rebase»"
#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "baixar fent «rebase»"
#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "cometeu-los o emmagatzemeu-los."
#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fast-forwarding your working tree from\n"
"commit %s."
msgstr ""
"l'obtenció ha actualitzat HEAD de la branca actual.\n"
"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"After making sure that you saved anything precious from\n"
"$ git diff %s\n"
"output, run\n"
"$ git reset --hard\n"
"to recover."
msgstr ""
"No es pot avançar ràpidament el vostre arbre de treball.\n"
"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida "
"de\n"
"$ git diff %s\n"
"executeu\n"
"$ git reset --hard\n"
"per a recuperar."
#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "No es poden fusionar múltiples branques a un HEAD buit."
#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot fer «rebase» sobre múltiples branques."
#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no es pot fer «rebase» amb modificacions als submòduls enregistrades "
"localment"
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "abreviatura d'etiqueta sense <tag>"
#: builtin/push.c:121
msgid "--delete only accepts plain target ref names"
msgstr "--delete només accepta noms de referència de destí senzills"
#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
"\n"
"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help "
"config'."
#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
"the name of your current branch. To push to the upstream branch\n"
"on the remote, use\n"
"\n"
" git push %s HEAD:%s\n"
"\n"
"To push to the branch of the same name on the remote, use\n"
"\n"
" git push %s HEAD\n"
"%s"
msgstr ""
"La branca font de la vostra branca actual no coincideix\n"
"amb el nom de la vostra branca actual. Per a pujar-la a la\n"
"branca font en el remot, useu\n"
"\n"
" git push %s HEAD:%s\n"
"\n"
"Per a pujar a la branca del mateix nom en el remot, useu\n"
"\n"
" git push %s HEAD\n"
"%s"
#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
"To push the history leading to the current (detached HEAD)\n"
"state now, use\n"
"\n"
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
"Actualment no sou en cap branca.\n"
"Per a pujar la història que condueix a l'estat actual\n"
"(HEAD separat) ara, useu\n"
"\n"
" git push %s HEAD:<nom-de-branca-remota>\n"
#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
"To push the current branch and set the remote as upstream, use\n"
"\n"
" git push --set-upstream %s %s\n"
msgstr ""
"La branca actual %s no té cap branca font.\n"
"Per a pujar la branca actual i establir el remot com a font, useu\n"
"\n"
" git push --set-upstream %s %s\n"
#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branca actual %s té múltiples branques fonts, s'està refusant pujar."
#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
"Esteu pujant al remot «%s», que no és la font de la vostra\n"
"branca actual «%s», sense dir-me què pujar per a actualitzar\n"
"quina branca remota."
#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"No heu especificat cap especificació de referència a pujar, i push.default "
"és \"nothing\"."
#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
"'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"S'han rebutjat les actualitzacions perquè el punt de la vostra branca\n"
"actual està darrere de la seva branca remota corresponent. Integreu\n"
"els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
#: builtin/push.c:282
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
"(e.g. 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"S'han rebutjat les actualitzacions perquè un punt de branca pujada\n"
"està darrere de la seva branca remota corresponent. Agafeu aquesta\n"
"branca i integreu els canvis remots (per exemple, 'git pull ...')\n"
"abans de pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
#: builtin/push.c:288
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
"to the same ref. You may want to first integrate the remote changes\n"
"(e.g., 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"S'han rebutjat les actualitzacions perquè el remot conté canvis\n"
"que no teniu localment. Això acostuma a ser causat per un altre dipòsit\n"
"que ha pujat a la mateixa referència. Pot ser que primer vulgueu\n"
"integrar els canvis remots (per exemple, 'git pull ...') abans de\n"
"pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
#: builtin/push.c:298
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
"No podeu actualitzar una referència remota que assenyala un\n"
"objecte no de comissió, ni actualitzar una referència remota per\n"
"fer que assenyali un objecte no de comissió, sense usar l'opció\n"
"'--force'.\n"
#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "S'està pujant a %s\n"
#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "s'ha produït un error en pujar algunes referències a «%s»"
#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "dipòsit incorrecte «%s»"
#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"repository using\n"
"\n"
" git remote add <name> <url>\n"
"\n"
"and then push using the remote name\n"
"\n"
" git push <name>\n"
msgstr ""
"No hi ha cap destí de pujada configurat.\n"
"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot "
"fent servir\n"
"\n"
" git remote add <nom> <url>\n"
"\n"
"i després pugeu fent servir el nom remot\n"
"\n"
" git push <nom>\n"
#: builtin/push.c:554
msgid "repository"
msgstr "dipòsit"
#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "puja totes les referències"
#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "reflecteix totes les referències"
#: builtin/push.c:558
msgid "delete refs"
msgstr "suprimeix les referències"
#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "força les actualitzacions"
#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "<nom-de-referència>:<esperat>"
#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "controla la pujada recursiva dels submòduls"
#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "usa el paquet prim"
#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "programa que rep els paquets"
#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "estableix la font per a git pull/status"
#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "poda les referències eliminades localment"
#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "evita el lligam de prepujada"
#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "puja les etiquetes absents però rellevants"
#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "signa la pujada amb GPG"
#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "demana una transacció atòmica al costat remot"
#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete és incompatible amb --all, --mirror i --tags"
#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no té sentit sense referències"
#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "--all i --tags són incompatibles"
#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "--all no es pot combinar amb especificacions de referència"
#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "--mirror i --tags són incompatibles"
#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no es pot combinar amb especificacions de referència"
#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "--all i --mirror són incompatibles"
#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr "les opcions de pujada no han de tenir caràcters de línia nova"
#: builtin/range-diff.c:8
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
#: builtin/range-diff.c:9
#, fuzzy
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git merge [<opcions>] [<comissió>...]"
#: builtin/range-diff.c:10
#, fuzzy
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git mv [<opcions>] <font>... <destí>"
#: builtin/range-diff.c:21
msgid "Percentage by which creation is weighted"
msgstr ""
#: builtin/range-diff.c:23
msgid "use simple diff colors"
msgstr "utilitza colors simples de diff"
#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr "cap .. en rang: «%s»"
#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "el format de l'argument únic ha de ser de rang simètric"
#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "calen dos rangs de comissió"
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "escriu l'índex resultant al <fitxer>"
#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "només buida l'índex"
#: builtin/read-tree.c:129
msgid "Merging"
msgstr "S'està fusionant"
#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "realitza una fusió a més d'una lectura"
#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers"
#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "fusió de 3 vies en presència d'afegiments i eliminacions"
#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "el mateix que -m, però descarta les entrades no fusionades"
#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<subdirectori>/"
#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "llegiu l'arbre a l'índex sota <subdirectori>/"
#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "actualitza l'arbre de treball amb el resultat de fusió"
#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "permet que els fitxers explícitament ignorats se sobreescriguin"
#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "no comprovis l'arbre de treball després de fusionar"
#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "no actualitzis l'índex ni l'arbre de treball"
#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "omet l'aplicació del filtre d'agafament parcial"
#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
#: builtin/read-tree.c:157
#, fuzzy
msgid "suppress feedback messages"
msgstr "omet els missatges informatius"
#: builtin/rebase.c:32
#, fuzzy
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
msgstr ""
"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
"[<camí>...]"
#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
#, c-format
msgid "unusable todo list: '%s'"
msgstr "llista per a fer inestable: «%s»"
#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
#, c-format
msgid "could not write '%s'."
msgstr "no s'ha pogut escriure a «%s»."
#: builtin/rebase.c:252
msgid "no HEAD?"
msgstr "no hi ha cap HEAD?"
#: builtin/rebase.c:279
#, c-format
msgid "could not create temporary %s"
msgstr "no s'ha pogut crear el fitxer temporal %s"
#: builtin/rebase.c:285
msgid "could not mark as interactive"
msgstr "no s'ha pogut marcar com a interactiu"
#: builtin/rebase.c:343
msgid "could not generate todo list"
msgstr "no s'ha pogut generar la llista per a fer"
#: builtin/rebase.c:382
msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
#: builtin/rebase.c:437
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<opcions>]"
#: builtin/rebase.c:449
msgid "keep empty commits"
msgstr "mantén les comissions buides"
#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "permet les comissions amb missatges buits"
#: builtin/rebase.c:452
msgid "rebase merge commits"
msgstr "fes «rebase» de les comissions de fusió"
#: builtin/rebase.c:454
msgid "keep original branch points of cousins"
msgstr ""
#: builtin/rebase.c:456
msgid "move commits that begin with squash!/fixup!"
msgstr ""
#: builtin/rebase.c:457
msgid "sign commits"
msgstr "signa les comissions"
#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr ""
#: builtin/rebase.c:461
msgid "continue rebase"
msgstr "continua el «rebase»"
#: builtin/rebase.c:463
msgid "skip commit"
msgstr "omet la comissió"
#: builtin/rebase.c:464
msgid "edit the todo list"
msgstr "edita la llista a fer"
#: builtin/rebase.c:466
msgid "show the current patch"
msgstr "mostra el pedaç actual"
#: builtin/rebase.c:469
msgid "shorten commit ids in the todo list"
msgstr "escurça els ids de les comissions en la llista per a fer"
#: builtin/rebase.c:471
msgid "expand commit ids in the todo list"
msgstr "expandeix els ids de les comissions en la llista per a fer"
#: builtin/rebase.c:473
msgid "check the todo list"
msgstr "comprova la llista a fer"
#: builtin/rebase.c:475
msgid "rearrange fixup/squash lines"
msgstr "reorganitza les línies «fixup/pick»"
#: builtin/rebase.c:477
msgid "insert exec commands in todo list"
msgstr "expandeix les ordres exec en la llista per a fer"
#: builtin/rebase.c:478
msgid "onto"
msgstr ""
#: builtin/rebase.c:481
#, fuzzy
msgid "restrict-revision"
msgstr "revisió"
#: builtin/rebase.c:481
#, fuzzy
msgid "restrict revision"
msgstr "revisió"
#: builtin/rebase.c:483
msgid "squash-onto"
msgstr ""
#: builtin/rebase.c:484
msgid "squash onto"
msgstr ""
#: builtin/rebase.c:486
#, fuzzy
msgid "the upstream commit"
msgstr "Desassigna la informació de font"
#: builtin/rebase.c:488
#, fuzzy
msgid "head-name"
msgstr "canvi de nom"
#: builtin/rebase.c:488
#, fuzzy
msgid "head name"
msgstr "davant per "
#: builtin/rebase.c:493
#, fuzzy
msgid "rebase strategy"
msgstr "estratègia de fusió"
#: builtin/rebase.c:494
#, fuzzy
msgid "strategy-opts"
msgstr "estratègia"
#: builtin/rebase.c:495
#, fuzzy
msgid "strategy options"
msgstr "opcions de decoració"
#: builtin/rebase.c:496
msgid "switch-to"
msgstr ""
#: builtin/rebase.c:497
msgid "the branch or commit to checkout"
msgstr ""
#: builtin/rebase.c:498
#, fuzzy
msgid "onto-name"
msgstr "nom"
#: builtin/rebase.c:498
#, fuzzy
msgid "onto name"
msgstr "nom del remot"
#: builtin/rebase.c:499
#, fuzzy
msgid "cmd"
msgstr "ordre"
#: builtin/rebase.c:499
msgid "the command to run"
msgstr "l'ordre a executar"
#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
#: builtin/rebase.c:518
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s requereix un «rebase» interactiu"
#: builtin/rebase.c:586
#, fuzzy, c-format
msgid "could not get 'onto': '%s'"
msgstr "no s'ha pogut establir «%s» a «%s»"
#: builtin/rebase.c:601
#, fuzzy, c-format
msgid "invalid orig-head: '%s'"
msgstr "fitxer no vàlid: «%s»"
#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "No s'ha pogut llegir «%s»"
#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "No es pot emmagatzemar %s"
#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "no s'ha pogut determinar la revisió de HEAD"
#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"You can instead skip this commit: run \"git rebase --skip\".\n"
"To abort and get back to the state before \"git rebase\", run \"git rebase --"
"abort\"."
msgstr ""
"Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
"«git add/rm <fitxers amb conflicte>», llavors executeu «git rebase --"
"continue».\n"
"Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\n"
"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», "
"executeu «git rebase --abort»."
#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"git encountered an error while preparing the patches to replay\n"
"these revisions:\n"
"\n"
" %s\n"
"\n"
"As a result, git cannot rebase them."
msgstr ""
#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
"Please specify which branch you want to rebase against.\n"
"See git-rebase(1) for details.\n"
"\n"
" git rebase '<branch>'\n"
"\n"
msgstr ""
"%s\n"
"Especifiqueu sobre què branca voleu fer «rebase».\n"
"Vegeu git-rebase(1) per detalls.\n"
"\n"
" git rebase '<branca>'\n"
"\n"
#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
"\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
msgstr ""
"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
"amb:\n"
"\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
#: builtin/rebase.c:1364
#, fuzzy
msgid "exec commands cannot contain newlines"
msgstr "expandeix les ordres exec en la llista per a fer"
#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr ""
#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "fes un «rebase» en la branca donada en comptes de la font"
#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "permet al lligam pre-rebase executar-se"
#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "silenciós. Implica --no-stat"
#: builtin/rebase.c:1406
#, fuzzy
msgid "do not show diffstat of what changed upstream"
msgstr "no mostris les estadístiques de diferència al final de la fusió"
#: builtin/rebase.c:1409
#, fuzzy
msgid "add a Signed-off-by: line to each commit"
msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "passa-ho a «git am»"
#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "passa-ho a «git-apply»"
#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "«cherry pick» totes les comissions, inclús les no canviades"
#: builtin/rebase.c:1428
msgid "continue"
msgstr "continua"
#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "omet el pedaç actual i continua"
#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "interromp i agafa la branca original"
#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "interromp però manté HEAD on és"
#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "edita la llista de coses a fer durant un «rebase» interactiu"
#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "mostra el pedaç que s'està aplicant o fusionant"
#: builtin/rebase.c:1443
#, fuzzy
msgid "use merging strategies to rebase"
msgstr "estratègia de fusió a usar"
#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr ""
#: builtin/rebase.c:1451
#, fuzzy
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "intenta recrear les "
#: builtin/rebase.c:1455
#, fuzzy
msgid "preserve empty commits during rebase"
msgstr "preserva les comissions inicialment buides"
#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
#: builtin/rebase.c:1463
#, fuzzy
msgid "automatically stash/stash pop before and after"
msgstr ""
"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr ""
#: builtin/rebase.c:1469
#, fuzzy
msgid "allow rebasing commits with empty messages"
msgstr "permet les comissions amb missatges buits"
#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr ""
#: builtin/rebase.c:1475
#, fuzzy
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "git merge-base --fork-point <referència> [<comissió>]"
#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "utilitza l'estratègia de fusió donada"
#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "opció"
#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "passa l'argument a l'estratègia de fusió"
#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "fes «rebase» de totes les comissions accessibles fins l'arrel"
#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Sembla que «git am» està en curs. No es pot fer «rebase»."
#: builtin/rebase.c:1547
#, fuzzy
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "No hi ha un «rebase» en curs?"
#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu."
#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "no s'han pogut descartar els canvis de l'arbre de treball"
#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "no s'ha pogut tornar a %s"
#: builtin/rebase.c:1673
#, fuzzy, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"I wonder if you are in the middle of another rebase. If that is the\n"
"case, please try\n"
"\t%s\n"
"If that is not the case, please\n"
"\t%s\n"
"and run me again. I am stopping in case you still have something\n"
"valuable there.\n"
msgstr ""
"Sembla que ja hi ha un directori $state_dir_base, i\n"
"em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n"
"cas, proveu\n"
"\t$cmd_live_rebase\n"
"Si no és el cas, \n"
"\t$cmd_clear_stale_rebase\n"
"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
"de valor."
#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "«switch» «c» espera un valor numèric"
#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Mode desconegut: %s"
#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requereix --merge o --interactive"
#: builtin/rebase.c:1797
#, fuzzy
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--strategy requereix --merge o --interactive"
#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr ""
#: builtin/rebase.c:1828
#, fuzzy
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
#: builtin/rebase.c:1832
#, fuzzy
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
#: builtin/rebase.c:1838
#, fuzzy
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy-option»"
#: builtin/rebase.c:1841
#, fuzzy
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»"
#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "font no vàlida: «%s»"
#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "no s'ha pogut crear una comissió arrel nova"
#: builtin/rebase.c:1889
#, fuzzy, c-format
msgid "'%s': need exactly one merge base"
msgstr "Cal exactament un rang."
#: builtin/rebase.c:1896
#, fuzzy, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No assenyala una comissió vàlida: $onto_name"
#: builtin/rebase.c:1921
#, fuzzy, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: no hi ha tal branca: $branch_name"
#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "No hi ha tal referència: %s"
#: builtin/rebase.c:1940
#, fuzzy
msgid "Could not resolve HEAD to a revision"
msgstr "no s'ha pogut resoldre la comissió HEAD"
#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "No es pot emmagatzemar automàticament"
#: builtin/rebase.c:1984
#, fuzzy, c-format
msgid "Unexpected stash response: '%s'"
msgstr "final de fitxer inesperat"
#: builtin/rebase.c:1990
#, fuzzy, c-format
msgid "Could not create directory for '%s'"
msgstr "No s'ha pogut crear el directori «%s»"
#: builtin/rebase.c:1993
#, fuzzy, c-format
msgid "Created autostash: %s\n"
msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
#: builtin/rebase.c:1996
#, fuzzy
msgid "could not reset --hard"
msgstr "No s'ha pogut llegir orig-head"
#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ara és a %s"
#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Cometeu-los o emmagatzemeu-los."
#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "no s'ha pogut analitzar «%s»"
#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "no s'ha pogut commutar a %s"
#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD està al dia."
#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La branca actual %s està al dia.\n"
#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "La branca actual està al dia, «rebase» forçat."
#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "La branca actual %s està al dia; «rebase» forçat.\n"
#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Canvis a %s:\n"
#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Canvis de %s a %s:\n"
#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
"damunt...\n"
#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "No s'ha pogut separar HEAD"
#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avanç ràpid %s a %s.\n"
#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
#: builtin/receive-pack.c:832
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"with what you pushed, and will require 'git reset --hard' to match\n"
"the work tree to HEAD.\n"
"\n"
"You can set the 'receive.denyCurrentBranch' configuration variable\n"
"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
"its current branch; however, this is not recommended unless you\n"
"arranged to update its work tree to match what you pushed in some\n"
"other way.\n"
"\n"
"To squelch this message and still keep the default behaviour, set\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
"Per defecte, es denega actualitzar la branca actual en un dipòsit no\n"
"nu, perquè faria l'índex i l'arbre de treball inconsistents amb el\n"
"que hàgiu pujat, i requeriria 'git reset --hard' per a fer que\n"
"l'arbre de treball coincideixi amb HEAD.\n"
"\n"
"Podeu establir la variable de configuració\n"
"'receive.denyCurrentBranch' a 'ignore' o 'warn' en el dipòsit remot\n"
"per a permetre pujar a la seva branca actual; no obstant, no es\n"
"recomana això a menys que hàgiu decidit actualitzar el seu arbre en\n"
"alguna altra manera per a coincidir amb el que hàgiu pujat.\n"
"\n"
"Per a silenciar aquest missatge i mantenir el comportament\n"
"predeterminat, establiu la variable de configuració\n"
"'receive.denyCurrentBranch' a 'refuse'."
#: builtin/receive-pack.c:852
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
"'warn' or 'ignore' in the remote repository to allow deleting the\n"
"current branch, with or without a warning message.\n"
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
"Per defecte, es denega suprimir la branca actual, perquè el\n"
"'git clone' següent no resultarà en cap fitxer agafat, causant\n"
"confusió.\n"
"\n"
"Podeu establir la variable de configuració\n"
"'receive.denyDeleteCurrent' a 'warn' o 'ignore' en el dipòsit remot\n"
"per a permetre suprimir la branca actual, amb un missatge\n"
"d'advertència o sense.\n"
"\n"
"Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "silenciós"
#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Heu d'especificar un directori."
#: builtin/reflog.c:17
msgid ""
"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
"<refs>..."
msgstr ""
#: builtin/reflog.c:22
msgid ""
"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
"<refs>..."
msgstr ""
#: builtin/reflog.c:25
msgid "git reflog exists <ref>"
msgstr ""
#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "«%s» no és una marca de temps vàlida"
#: builtin/reflog.c:605
#, fuzzy, c-format
msgid "Marking reachable objects..."
msgstr "retén els objectes inabastables"
#: builtin/reflog.c:643
#, c-format
msgid "%s points nowhere!"
msgstr ""
#: builtin/reflog.c:695
#, fuzzy
msgid "no reflog specified to delete"
msgstr "cap remot especificat"
#: builtin/reflog.c:704
#, fuzzy, c-format
msgid "not a reflog: %s"
msgstr "no es pot llegir «%s»"
#: builtin/reflog.c:709
#, fuzzy, c-format
msgid "no reflog for '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre per «%s»"
#: builtin/reflog.c:755
#, c-format
msgid "invalid ref format: %s"
msgstr "format de referència no vàlid: %s"
#: builtin/reflog.c:764
msgid "git reflog [ show | expire | delete | exists ]"
msgstr ""
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
#: builtin/remote.c:17
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <nom> <url>"
#: builtin/remote.c:18 builtin/remote.c:38
msgid "git remote rename <old> <new>"
msgstr "git remote rename <antic> <nou>"
#: builtin/remote.c:19 builtin/remote.c:43
msgid "git remote remove <name>"
msgstr "git remote remove <nom>"
#: builtin/remote.c:20 builtin/remote.c:48
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)"
#: builtin/remote.c:21
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <nom>"
#: builtin/remote.c:22
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <nom>"
#: builtin/remote.c:23
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]"
#: builtin/remote.c:24
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <nom> <branca>..."
#: builtin/remote.c:25 builtin/remote.c:74
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <nom>"
#: builtin/remote.c:26 builtin/remote.c:79
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]"
#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <nom> <url-nou>"
#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <nom> <url>"
#: builtin/remote.c:33
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<opcions>] <nom> <url>"
#: builtin/remote.c:53
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <nom> <branca>..."
#: builtin/remote.c:54
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <nom> <branca>..."
#: builtin/remote.c:59
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<opcions>] <nom>"
#: builtin/remote.c:64
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<opcions>] <nom>"
#: builtin/remote.c:69
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<opcions>] [<grup> | <remot>]..."
#: builtin/remote.c:98
#, c-format
msgid "Updating %s"
msgstr "S'està actualitzant %s"
#: builtin/remote.c:130
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
"--mirror és perillós i està en desús; \n"
"\t useu --mirror=fetch o\n"
"\t --mirror=push en lloc d'això"
#: builtin/remote.c:147
#, c-format
msgid "unknown mirror argument: %s"
msgstr "paràmetre de reflexió desconegut: %s"
#: builtin/remote.c:163
msgid "fetch the remote branches"
msgstr "obtén les branques remotes"
#: builtin/remote.c:165
msgid "import all tags and associated objects when fetching"
msgstr "en obtenir, importa totes les etiquetes i tots els objectes"
#: builtin/remote.c:168
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "o no obtinguis cap etiqueta (--no-tags)"
#: builtin/remote.c:170
msgid "branch(es) to track"
msgstr "branques a seguir"
#: builtin/remote.c:171
msgid "master branch"
msgstr "branca mestra"
#: builtin/remote.c:173
msgid "set up remote as a mirror to push to or fetch from"
msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir"
#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
msgstr "especificar una branca mestra no té sentit amb --mirror"
#: builtin/remote.c:187
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"especificar les branques a seguir té sentit només amb miralls d'obtenció"
#: builtin/remote.c:194 builtin/remote.c:636
#, c-format
msgid "remote %s already exists."
msgstr "el remot %s ja existeix."
#: builtin/remote.c:198 builtin/remote.c:640
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "«%s» no és un nom de remot vàlid"
#: builtin/remote.c:238
#, c-format
msgid "Could not setup master '%s'"
msgstr "No s'ha pogut configurar la mestra «%s»"
#: builtin/remote.c:344
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
"No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s"
#: builtin/remote.c:443 builtin/remote.c:451
msgid "(matching)"
msgstr "(coincident)"
#: builtin/remote.c:455
msgid "(delete)"
msgstr "(suprimir)"
#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
#, c-format
msgid "No such remote: '%s'"
msgstr "No existeix el remot «%s»"
#: builtin/remote.c:646
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "No s'ha pogut canviar el nom de la secció de configuració «%s» a «%s»"
#: builtin/remote.c:666
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
"No s'està actualitzant l'especificació de referències d'obtenció no per "
"defecte\n"
"\t%s\n"
"\tActualitzeu la configuració manualment si és necessari."
#: builtin/remote.c:702
#, c-format
msgid "deleting '%s' failed"
msgstr "la supressió de «%s» ha fallat"
#: builtin/remote.c:736
#, c-format
msgid "creating '%s' failed"
msgstr "la creació de «%s» ha fallat"
#: builtin/remote.c:802
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgid_plural ""
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
"to delete them, use:"
msgstr[0] ""
"Nota: Una branca fora de la jerarquia refs/remotes/ no s'ha eliminat;\n"
"per a suprimir-la, useu:"
msgstr[1] ""
"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han "
"eliminat;\n"
"per a suprimir-les, useu:"
#: builtin/remote.c:816
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No s'ha pogut eliminar la secció de configuració «%s»"
#: builtin/remote.c:917
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
#: builtin/remote.c:920
msgid " tracked"
msgstr " seguit"
#: builtin/remote.c:922
msgid " stale (use 'git remote prune' to remove)"
msgstr " estancat (useu 'git remote prune' per a eliminar)"
#: builtin/remote.c:924
msgid " ???"
msgstr " ???"
#: builtin/remote.c:965
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca"
#: builtin/remote.c:974
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "es fa «rebase» interactivament sobre el remot %s"
#: builtin/remote.c:976
#, fuzzy, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "es fa «rebase» interactivament sobre el remot %s"
#: builtin/remote.c:979
#, c-format
msgid "rebases onto remote %s"
msgstr "es fa «rebase» sobre el remot %s"
#: builtin/remote.c:983
#, c-format
msgid " merges with remote %s"
msgstr "es fusiona amb el remot %s"
#: builtin/remote.c:986
#, c-format
msgid "merges with remote %s"
msgstr "es fusiona amb el remot %s"
#: builtin/remote.c:989
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s i amb el remot %s\n"
#: builtin/remote.c:1032
msgid "create"
msgstr "crea"
#: builtin/remote.c:1035
msgid "delete"
msgstr "suprimeix"
#: builtin/remote.c:1039
msgid "up to date"
msgstr "al dia"
#: builtin/remote.c:1042
msgid "fast-forwardable"
msgstr "avanç ràpid possible"
#: builtin/remote.c:1045
msgid "local out of date"
msgstr "local no actualitzat"
#: builtin/remote.c:1052
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força a %-*s (%s)"
#: builtin/remote.c:1055
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s puja a %-*s (%s)"
#: builtin/remote.c:1059
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força a %s"
#: builtin/remote.c:1062
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s puja a %s"
#: builtin/remote.c:1130
msgid "do not query remotes"
msgstr "no consultis els remots"
#: builtin/remote.c:1157
#, c-format
msgid "* remote %s"
msgstr "* remot %s"
#: builtin/remote.c:1158
#, c-format
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(sense URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
#.
#: builtin/remote.c:1173 builtin/remote.c:1175
#, c-format
msgid " Push URL: %s"
msgstr " URL de pujada: %s"
#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
#, c-format
msgid " HEAD branch: %s"
msgstr " Branca de HEAD: %s"
#: builtin/remote.c:1177
msgid "(not queried)"
msgstr "(no consultat)"
#: builtin/remote.c:1179
msgid "(unknown)"
msgstr "(desconegut)"
#: builtin/remote.c:1183
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Branca de HEAD (la HEAD remot és ambigua, pot ser un dels següents):\n"
#: builtin/remote.c:1195
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
#: builtin/remote.c:1198 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (estat no consultat)"
#: builtin/remote.c:1207
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branca local configurada per a «git pull»:"
msgstr[1] " Branques locals configurades per a «git pull»:"
#: builtin/remote.c:1215
msgid " Local refs will be mirrored by 'git push'"
msgstr " «git push» reflectirà les referències locals"
#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referència local configurada per a «git push»%s:"
msgstr[1] " Referències locals configurades per a «git push»%s:"
#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<name>/HEAD"
#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar la HEAD remota"
#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiples branques de HEAD remotes. Trieu-ne una explícitament amb:"
#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "S'està podant %s"
#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
#, c-format
msgid "No such remote '%s'"
msgstr "No hi ha tal remot «%s»"
#: builtin/remote.c:1454
msgid "add branch"
msgstr "afegeix branca"
#: builtin/remote.c:1461
msgid "no remote specified"
msgstr "cap remot especificat"
#: builtin/remote.c:1478
msgid "query push URLs rather than fetch URLs"
msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
#: builtin/remote.c:1480
msgid "return all URLs"
msgstr "retorna tots els URL"
#: builtin/remote.c:1508
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "cap URL configurat per al remot «%s»"
#: builtin/remote.c:1534
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
#: builtin/remote.c:1536
msgid "add URL"
msgstr "afegeix URL"
#: builtin/remote.c:1538
msgid "delete URLs"
msgstr "suprimeix els URL"
#: builtin/remote.c:1545
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
#: builtin/remote.c:1584
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
#: builtin/remote.c:1592
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
#: builtin/remote.c:1594
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
#: builtin/remote.c:1610
msgid "be verbose; must be placed before a subcommand"
msgstr "sigues detallat; s'ha de col·locar abans d'un subordre"
#: builtin/remote.c:1641
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subordre desconeguda: %s"
#: builtin/repack.c:22
msgid "git repack [<options>]"
msgstr "git repack [<opcions>]"
#: builtin/repack.c:27
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
"Els reempaquetaments incrementals són incompatibles amb els índexs de "
"bitmaps. Useu\n"
"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack."
"writebitmaps."
#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
#: builtin/repack.c:240 builtin/repack.c:418
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
#: builtin/repack.c:257
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
#: builtin/repack.c:295
msgid "pack everything in a single pack"
msgstr "empaqueta-ho tot en un únic paquet"
#: builtin/repack.c:297
msgid "same as -a, and turn unreachable objects loose"
msgstr "el mateix que -a, i solta els objectes inabastables"
#: builtin/repack.c:300
msgid "remove redundant packs, and run git-prune-packed"
msgstr "elimina els paquets redundants, i executeu git-prune-packed"
#: builtin/repack.c:302
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passa --no-reuse-delta a git-pack-objects"
#: builtin/repack.c:304
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passa --no-reuse-object a git-pack-objects"
#: builtin/repack.c:306
msgid "do not run git-update-server-info"
msgstr "no executis git-update-server-info"
#: builtin/repack.c:309
msgid "pass --local to git-pack-objects"
msgstr "passa --local a git-pack-objects"
#: builtin/repack.c:311
msgid "write bitmap index"
msgstr "escriu índex de mapa de bits"
#: builtin/repack.c:313
#, fuzzy
msgid "pass --delta-islands to git-pack-objects"
msgstr "passa --local a git-pack-objects"
#: builtin/repack.c:314
msgid "approxidate"
msgstr "data aproximada"
#: builtin/repack.c:315
msgid "with -A, do not loosen objects older than this"
msgstr "amb -A, no soltis els objectes més vells que aquest"
#: builtin/repack.c:317
msgid "with -a, repack unreachable objects"
msgstr "amb -a, reempaqueta els objectes inabastables"
#: builtin/repack.c:319
msgid "size of the window used for delta compression"
msgstr "mida de la finestra que s'usa per a compressió de diferències"
#: builtin/repack.c:320 builtin/repack.c:326
msgid "bytes"
msgstr "octets"
#: builtin/repack.c:321
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre "
"d'entrades"
#: builtin/repack.c:323
msgid "limits the maximum delta depth"
msgstr "limita la profunditat màxima de les diferències"
#: builtin/repack.c:325
msgid "limits the maximum number of threads"
msgstr "limita el nombre màxim de fils"
#: builtin/repack.c:327
msgid "maximum size of each packfile"
msgstr "mida màxima de cada fitxer de paquet"
#: builtin/repack.c:329
msgid "repack objects in packs marked with .keep"
msgstr "reempaqueta els objectes en paquets marcats amb .keep"
#: builtin/repack.c:331
#, fuzzy
msgid "do not repack this pack"
msgstr "crea paquets prims"
#: builtin/repack.c:341
msgid "cannot delete packs in a precious-objects repo"
msgstr "no es poden suprimir paquets en un dipòsit d'objectes preciosos"
#: builtin/repack.c:345
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable i -A són incompatibles"
#: builtin/repack.c:427
#, fuzzy
msgid "Nothing new to pack."
msgstr "usa el paquet prim"
#: builtin/repack.c:488
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"WARNING: prefixing old- to their name, in order to\n"
"WARNING: replace them with the new version of the\n"
"WARNING: file. But the operation failed, and the\n"
"WARNING: attempt to rename them back to their\n"
"WARNING: original names also failed.\n"
"WARNING: Please rename them in %s manually:\n"
msgstr ""
#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr "s'ha produït un error en eliminar «%s»"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <objecte> <reemplaçament>"
#: builtin/replace.c:23
msgid "git replace [-f] --edit <object>"
msgstr "git replace [-f] --edit <objecte>"
#: builtin/replace.c:24
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <comissió> [<mare>...]"
#: builtin/replace.c:25
msgid "git replace [-f] --convert-graft-file"
msgstr "git replace [-f] --convert-graft-file"
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <objecte>..."
#: builtin/replace.c:27
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<patró>]]"
#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"
msgstr ""
#: builtin/replace.c:125
#, fuzzy, c-format
msgid "replace ref '%s' not found"
msgstr "no s'ha trobat la branca «%s»."
#: builtin/replace.c:141
#, fuzzy, c-format
msgid "Deleted replace ref '%s'"
msgstr "suprimeix les referències reemplaçades"
#: builtin/replace.c:153
#, fuzzy, c-format
msgid "'%s' is not a valid ref name"
msgstr "«%s» no és un nom de remot vàlid"
#: builtin/replace.c:158
#, fuzzy, c-format
msgid "replace ref '%s' already exists"
msgstr "el destí «%s» ja existeix"
#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
"'%s' points to a replaced object of type '%s'\n"
"while '%s' points to a replacement object of type '%s'."
msgstr ""
#: builtin/replace.c:229
#, fuzzy, c-format
msgid "unable to open %s for writing"
msgstr "No s'ha pogut obrir «%s» per a escriptura"
#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr ""
#: builtin/replace.c:258
#, fuzzy, c-format
msgid "unable to open %s for reading"
msgstr "no s'ha pogut obrir o llegir %s"
#: builtin/replace.c:272
#, fuzzy
msgid "unable to spawn mktree"
msgstr "no s'ha pogut llegir l'arbre (%s)"
#: builtin/replace.c:276
#, fuzzy
msgid "unable to read from mktree"
msgstr "no s'ha pogut llegir l'arbre (%s)"
#: builtin/replace.c:285
#, fuzzy
msgid "mktree reported failure"
msgstr "la reversió ha fallat"
#: builtin/replace.c:289
#, fuzzy
msgid "mktree did not return an object name"
msgstr "el remot no ha enviat tots els objectes necessaris"
#: builtin/replace.c:298
#, fuzzy, c-format
msgid "unable to fstat %s"
msgstr "no s'ha pogut actualitzar %s"
#: builtin/replace.c:303
#, fuzzy
msgid "unable to write object to database"
msgstr "no s'ha pogut escriure l'objecte de nota"
#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
#: builtin/replace.c:452
#, fuzzy, c-format
msgid "not a valid object name: '%s'"
msgstr "No és un nom d'objecte vàlid: «%s»"
#: builtin/replace.c:326
#, fuzzy, c-format
msgid "unable to get object type for %s"
msgstr "no es pot fer grep des d'un objecte de tipus %s"
#: builtin/replace.c:342
#, fuzzy
msgid "editing object file failed"
msgstr "la lectura de les referències de bisecció ha fallat"
#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
#: builtin/replace.c:383
#, fuzzy, c-format
msgid "could not parse %s as a commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "etiqueta de fusió mal formada en la comissió «%s»"
#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
"la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; "
"useu --edit en lloc de --graft"
#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "la comissió original «%s» té una signatura gpg"
#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»"
#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "la comissió nova és la mateixa que l'antiga: «%s»"
#: builtin/replace.c:525
#, fuzzy, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr "Eliminaria l'ítem següent:"
#: builtin/replace.c:546
msgid "list replace refs"
msgstr "llista les referències reemplaçades"
#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "suprimeix les referències reemplaçades"
#: builtin/replace.c:548
msgid "edit existing object"
msgstr "edita un objecte existent"
#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "canvia les mares d'una comissió"
#: builtin/replace.c:550
#, fuzzy
msgid "convert existing graft file"
msgstr "força la sobreescriptura de fitxers existents"
#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "reemplaça la referència si existeix"
#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "no imprimeixis bellament els continguts per a --edit"
#: builtin/replace.c:554
msgid "use this format"
msgstr "usa aquest format"
#: builtin/replace.c:567
#, fuzzy
msgid "--format cannot be used when not listing"
msgstr "--fix-thin no es pot usar sense --stdin"
#: builtin/replace.c:575
#, fuzzy
msgid "-f only makes sense when writing a replacement"
msgstr "-z només té sentit amb --stdin"
#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr "--raw només té sentit amb --edit"
#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr ""
#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr "nombre incorrecte d'arguments"
#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr "-e necessita exactament un argument"
#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr "-g necessita almenys un argument"
#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file arguments"
#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr "només es pot especificar un patró amb -l"
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
#: builtin/rerere.c:60
msgid "register clean resolutions in index"
msgstr "registra les resolucions netes en l'índex"
#: builtin/rerere.c:79
msgid "'git rerere forget' without paths is deprecated"
msgstr ""
#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "s'ha pogut generar el diff per a «%s»"
#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<arbre>] [--] <camins>..."
#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<arbre>] [--] [<camins>...]"
#: builtin/reset.c:40
msgid "mixed"
msgstr "mixt"
#: builtin/reset.c:40
msgid "soft"
msgstr "suau"
#: builtin/reset.c:40
msgid "hard"
msgstr "dur"
#: builtin/reset.c:40
msgid "merge"
msgstr "fusió"
#: builtin/reset.c:40
msgid "keep"
msgstr "reteniment"
#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "No teniu un HEAD vàlid."
#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "S'ha produït un error en trobar l'arbre de HEAD."
#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "S'ha produït un error en cercar l'arbre de %s."
#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "No es pot fer un restabliment de %s enmig d'una fusió."
#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "sigues silenciós, només informa d'errors"
#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "restableix HEAD i l'índex"
#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "restableix només HEAD"
#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "restableix HEAD, l'índex i l'arbre de treball"
#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "restableix HEAD però retén els canvis locals"
#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr "registra només el fet que els camins eliminats s'afegiran després"
#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "S'ha produït un error en resoldre «%s» com a revisió vàlida."
#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "S'ha produït un error en resoldre «%s» com a arbre vàlid."
#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch és incompatible amb --{hard,mixed,soft}"
#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc "
"d'això."
#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No es pot restablir de %s amb camins."
#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "el restabliment de %s no es permet en un dipòsit nu"
#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N només es pot usar amb --mixed"
#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Canvis «unstaged» després del restabliment:"
#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
"to make this the default.\n"
msgstr ""
#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»."
#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "No s'ha pogut escriure el fitxer d'índex nou."
#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "no es pot combinar --exclude-promisor-objects i --missing"
#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "el filtratge d'objectes requereix --objects"
#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "valor parcial no vàlid: «%s»"
#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "no es pot combinar --use-bitmap-index amb el filtratge d'objectes"
#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "retén el «--» passat com a paràmetre"
#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "deixa d'analitzar després del primer paràmetre no d'opció"
#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
" or: git rev-parse [<options>] [<arg>...]\n"
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
"git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]\n"
" or: git rev-parse --sq-quote [<paràmetre>...]\n"
" or: git rev-parse [<opcions>] [<paràmetre>...]\n"
"\n"
"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús "
"inicial."
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
msgstr "git revert [<opcions>] <comissió>..."
#: builtin/revert.c:25
msgid "git revert <subcommand>"
msgstr "git revert <subordre>"
#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr "git cherry-pick [<opcions>] <comissió>..."
#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <subordre>"
#: builtin/revert.c:72
#, c-format
msgid "option `%s' expects a number greater than zero"
msgstr "l'opció «%s» espera un nombre major que zero"
#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s no es pot usar amb %s"
#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "acaba la seqüència de reversió o el «cherry pick»"
#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "reprèn la seqüència de reversió o el «cherry pick»"
#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "cancel·la la seqüència de reversió o el «cherry pick»"
#: builtin/revert.c:105
msgid "skip current commit and continue"
msgstr "omet la comissió actual i continua"
#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "no cometis automàticament"
#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "edita el missatge de comissió"
#: builtin/revert.c:111
msgid "parent-number"
msgstr "número del pare"
#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "selecciona la línia principal del pare"
#: builtin/revert.c:114
msgid "merge strategy"
msgstr "estratègia de fusió"
#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "opció d'estratègia de fusió"
#: builtin/revert.c:125
msgid "append commit name"
msgstr "nom de la comissió a annexar"
#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "preserva les comissions inicialment buides"
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "retén les comissions redundants i buides"
#: builtin/revert.c:232
msgid "revert failed"
msgstr "la reversió ha fallat"
#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "el «cherry pick» ha fallat"
#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<opcions>] [--] <fitxer>..."
#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgid_plural ""
"the following files have staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
"el fitxer següent té contingut «stage» diferent d'ambdós el\n"
"fitxer i la HEAD:"
msgstr[1] ""
"els fitxers següents tenen contingut «stage» diferent d'ambdós\n"
"el fitxer i la HEAD:"
#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
"\n"
"(useu -f per a forçar l'eliminació)"
#: builtin/rm.c:216
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "el fitxer següent té canvis «staged» en l'índex:"
msgstr[1] "els fitxers següents tenen canvis «staged» en l'índex:"
#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
"\n"
"(useu --cached per a mantenir el fitxer, o -f per a forçar l'eliminació)"
#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "el fitxer següent té modificacions locals:"
msgstr[1] "els fitxers següents tenen modificacions locals:"
#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "no llistis els fitxers eliminats"
#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "només elimina de l'índex"
#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "passa per alt la comprovació d'actualitat"
#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "permet l'eliminació recursiva"
#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "surt amb estat zero encara que res hagi coincidit"
#: builtin/rm.c:289
#, fuzzy
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
"per a procedir"
#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "no s'està eliminant «%s» recursivament sense -r"
#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: no s'ha pogut eliminar %s"
#: builtin/send-pack.c:20
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
"[<ref>...]\n"
" --all and explicit <ref> specification are mutually exclusive."
msgstr ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-"
"pack=<paquet-del-git-receive>] [--verbose] [--thin] [--atomic] "
"[<màquina>:]<directori> [<referència>...]\n"
" --all i especificació <referència> explícita són mútuament excloents."
#: builtin/send-pack.c:163
msgid "remote name"
msgstr "nom del remot"
#: builtin/send-pack.c:177
msgid "use stateless RPC protocol"
msgstr "usa el protocol RPC sense estat"
#: builtin/send-pack.c:178
msgid "read refs from stdin"
msgstr "llegeix les referències des de stdin"
#: builtin/send-pack.c:179
msgid "print status from remote helper"
msgstr "imprimeix l'estat des de l'ajudant remot"
#: builtin/shortlog.c:14
#, fuzzy
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]"
#: builtin/shortlog.c:15
#, fuzzy
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git worktree list [<opcions>]"
#: builtin/shortlog.c:264
msgid "Group by committer rather than author"
msgstr "Agrupa per «comitter» en comptes de per autor"
#: builtin/shortlog.c:266
msgid "sort output according to the number of commits per author"
msgstr "ordena la sortida segons el nombre de comissions per autor"
#: builtin/shortlog.c:268
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
"Omet les descripcions de comissió, només proveeix el recompte de comissions"
#: builtin/shortlog.c:270
msgid "Show the email address of each author"
msgstr "Mostra l'adreça electrònica de cada autor"
#: builtin/shortlog.c:271
msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
#: builtin/shortlog.c:272
msgid "Linewrap output"
msgstr "Ajusta les línies de la sortida"
#: builtin/shortlog.c:301
#, fuzzy
msgid "too many arguments given outside repository"
msgstr "hi ha massa arguments per a desassignar la font"
#: builtin/show-branch.c:13
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<quan>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
#: builtin/show-branch.c:395
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "s'està ignorant %s; no es pot gestionar més de %d referència"
msgstr[1] "s'està ignorant %s; no es poden gestionar més de %d referències"
#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "no hi ha referències coincidents amb %s"
#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "mostra les branques amb seguiment remot i les locals"
#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "mostra les branques amb seguiment remot"
#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "colora '*!+-' corresponent a la branca"
#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "mostra <n> comissions després de l'avantpassat comú"
#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "sinònim de more=-1"
#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "omet anomenar cadenes"
#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "inclou la branca actual"
#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "anomena les comissions amb els seus noms d'objecte"
#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "mostra les bases de fusió possibles"
#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "mostra les referències inabastables de qualsevol altra referència"
#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "mostra les comissions en ordre topològic"
#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "mostra només les comissions que no siguin en la primera branca"
#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "mostra les fusions abastables de només una punta"
#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostra les <n> entrades més recents començant a la base"
#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "no s'ha donat cap branca, i HEAD no és vàlid"
#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "l'opció --reflog necessita un nom de branca"
#: builtin/show-branch.c:741
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "es pot mostrar només %d entrada a la vegada."
msgstr[1] "es poden mostrar només %d entrades a la vegada."
#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "no hi ha tal referència %s"
#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "no es pot gestionar més d'%d revisió."
msgstr[1] "no es poden gestionar més de %d revisions."
#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "«%s» no és una referència vàlida."
#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "no es pot trobar la comissió %s (%s)"
#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<patró>]"
#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "mostra només les etiquetes (es pot combinar amb heads)"
#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "mostra només els caps (es pot combinar amb tags)"
#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr ""
"comprovació de referència més estricta, requereix el camí de referència "
"exacte"
#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "mostra la referència HEAD, encara que es filtrés"
#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "desreferencia les etiquetes a ID d'objecte"
#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "mostra el hash SHA1 usant només <n> xifres"
#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "no imprimeixis els resultats a stdout (útil amb --verify)"
#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "mostra les referències de stdin que no siguin en el dipòsit local"
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96 af6b65d45e Git 2.26.2 7397ca3373 Git 2.25.4 b86a4be245 Git 2.24.3 f2771efd07 Git 2.23.3 c9808fa014 Git 2.22.4 9206d27eb5 Git 2.21.3 041bc65923 Git 2.20.4 76b54ee9b9 Git 2.19.5 ba6f0905fd Git 2.18.4 df5be6dc3f Git 2.17.5 1a3609e402 fsck: reject URL with empty host in .gitmodules e7fab62b73 credential: treat URL with empty scheme as invalid c44088ecc4 credential: treat URL without scheme as invalid fe29a9b7b0 credential: die() when parsing invalid urls a2b26ffb1a fsck: convert gitmodules url to URL passed to curl 8ba8ed568e credential: refuse to operate when missing host or protocol 24036686c4 credential: parse URL without host as empty host, not unset 73aafe9bc2 t0300: use more realistic inputs a88dbd2f8c t0300: make "quit" helper more realistic de49261b05 Git 2.26.1 274b9cc253 Git 2.26 55a7568606 Merge branch 'en/rebase-backend' c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git 1557364fb4 l10n: tr.po: change file mode to 644 2da1b05674 t3419: prevent failure when run with EXPENSIVE 1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0 5804c6ec40 l10n: de.po: add missing space 98cedd0233 Merge https://github.com/prati0100/git-gui 4914ba4bcf l10n: tr: Fix a couple of ambiguities a5728022e0 Merge branch 'py/remove-tcloo' 7fcb965970 RelNotes/2.26.0: fix various typos f0c03bcf95 l10n: Update Catalan translation 67b0a24910 Git 2.25.3 be8661a328 Sync with Git 2.25.2 0822e66b5d Git 2.25.2 65588b0b2e unicode: update the width tables to Unicode 13.0 7be274b0ff Merge branch 'js/ci-windows-update' into maint 9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint 221887a492 Merge branch 'jk/doc-credential-helper' into maint 32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint 618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint 50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint 41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint 2d7247af6f Merge branch 'am/mingw-poll-fix' into maint 4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint 76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint 569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint 16a4bf1035 Merge branch 'en/check-ignore' into maint 3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint 56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint 1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint 7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint 93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint 758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint 506223f9c5 Git 2.24.2 17a02783d8 Git 2.23.2 69fab82147 Git 2.22.3 fe22686494 Git 2.21.2 d1259ce117 Git 2.20.3 a5979d7009 Git 2.19.4 21a3e5016b Git 2.18.3 c42c0f1297 Git 2.17.4 d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u) 3891a84ccd git-gui: create a new namespace for chord script evaluation 8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5 440e7442d1 l10n: zh_CN: Revise v2.26.0 translation 2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 6c85aac65f Git 2.26-rc2 74f172e39e Merge branch 'en/test-cleanup' e96327c947 Merge branch 'es/outside-repo-errmsg-hints' ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 15fa8d9667 l10n: vi: fix translation + grammar 5c20398699 prefix_path: show gitdir if worktree unavailable 1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) a4a2f64642 Merge branch 'js/askpass-coerce-utf8' 850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows d769dcc5cd Merge branch 'py/blame-status-error' 70e24186c0 t6022, t6046: fix flaky files-are-updated checks 30e9940356 Hopefully the final batch before -rc2 b4f0038525 Merge branch 'en/rebase-backend' 25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master 07259e74ec fsck: detect gitmodules URLs with embedded newlines c716fe4bd9 credential: detect unrepresentable values when parsing urls 17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr 9a6bbee800 credential: avoid writing values with newlines 17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2 1afe18a3bb l10n: es: 2.26.0 round#2 5ab9217a3c Merge branch of github.com:alshopov/git-po into master c6713676d6 Merge branch of github.com:bitigchi/git-po into master b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t) 2713dec02d l10n: tr: v2.26.0 round 2 c9ef57cc3a l10n: fr : v2.26.0 rnd 2 120b1eb731 git-rebase.txt: highlight backend differences with commit rewording 9a1b7474d6 sequencer: clear state upon dropping a become-empty commit 937d143630 i18n: unmark a message in rebase.c a56d361f66 Merge branch 'ds/sparse-add' 5fa9169ced Merge branch 'dr/push-remote-ref-update' cdef998b46 Merge branch 'jc/doc-single-h-is-for-help' 051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) 52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master 9643441983 l10n: tr: Add glossary for Turkish translations 438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git 2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u) dd2c269652 l10n: tr: Add Turkish translations 8f4f099f8b l10n: tr: Add Turkish translation team info b4374e96c8 Git 2.26-rc1 4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch' 3658d77f8e Merge branch 'hd/show-one-mergetag-fix' 6125104b88 Merge branch 'rt/format-zero-length-fix' 1ac37deba2 Merge branch 'am/mingw-poll-fix' cf372dc815 Merge branch 'en/test-cleanup' d1075adfdf Merge branch 'en/merge-path-collision' a4fd114ffc Merge branch 'kk/complete-diff-color-moved' a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file' 0e0d717537 Merge branch 'pb/am-show-current-patch' 9b7f726dfc Merge branch 'am/pathspec-f-f-more' 4605a73073 t1091: don't grep for `strerror()` string 4d9c2902a1 l10n: fr v2.26.0 rnd1 ad182bee3f Merge branch of github.com:alshopov/git-po into master 23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1 98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t) f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed) 76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po 076cbdcd73 Git 2.26-rc0 0d65f3fb1a t5537: adjust test_oid label e63cefb024 Merge branch 'hi/gpg-use-check-signature' 5da7329e29 Merge branch 'rs/commit-graph-code-simplification' 0108fc1b46 Merge branch 'js/ci-windows-update' f3ccd9f0d9 Merge branch 'be/describe-multiroot' a6b4709302 Merge branch 'ag/rebase-remove-redundant-code' b22db265d6 Merge branch 'es/recursive-single-branch-clone' e8e71848ea Merge branch 'jk/nth-packed-object-id' a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch' 4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere' 49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix' 2cbb058669 Merge branch 'bc/wildcard-credential' 25063e2530 Merge branch 'mr/bisect-in-c-1' f4d7dfce4d Merge branch 'ds/sparse-add' 4d864895a2 t2402: test worktree path when called in .git directory af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch() 7655b4119d remote-curl: show progress for fetches over dumb HTTP 2f268890c2 The eighth batch for 2.26 aa5a7e02ad Merge branch 'ma/test-cleanup' 58595e713c Merge branch 'rs/blame-typefix-for-fingerprint' ff41848e99 Merge branch 'rs/micro-cleanups' 4cbf1a0e22 Merge branch 'es/worktree-cleanup' 46703057c1 Merge branch 'ak/test-log-graph' 777815f5f9 Merge branch 'jk/run-command-formatfix' 444cff61b4 Merge branch 'ds/partial-clone-fixes' 48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure' 8c22bd9ff9 Merge branch 'en/rebase-backend' cb2f5a8e97 Merge branch 'en/check-ignore' 0df82d99da Merge branch 'jk/object-filter-with-bitmap' 80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix' 29b09c518c Merge branch 'jk/doc-diff-parallel' 237a28173f show_one_mergetag: print non-parent in hex form. 5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context" 6d1210e133 l10n: Update Catalan translation 0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification" 7329d94be7 config.mak.dev: re-enable -Wformat-zero-length 7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings 94f4d01932 mingw: workaround for hangs when sending STDIN 1ff466c018 Documentation: clarify that `-h` alone stands for `help` 65bf820d0e t6020: new test with interleaved lexicographic ordering of directories 9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it d5bb92eced t3035: prefer test_must_fail to bash negation for git commands b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions 42d180dd01 t602[1236], t6034: modernize test formatting 802050400a merge-recursive: apply collision handling unification to recursive case 7f487ce062 Azure Pipeline: switch to the latest agent pools 5ed9fc3fc8 ci: prevent `perforce` from being quarantined eafff6e41e t/lib-httpd: avoid using macOS' sed d68ce906c7 commit-graph: use progress title directly 30b1c7ad9d describe: don't abort too early when searching tags 240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to' 2d2118b814 The seventh batch for 2.26 325eb66830 Merge branch 'es/doc-mentoring' 87f17d790d Merge branch 'es/bright-colors' d0038f4b31 Merge branch 'bw/remote-rename-update-config' 132f600b06 clone: pass --single-branch during --recurse-submodules 47319576f1 submodule--helper: use C99 named initializer ffe005576a lib-log-graph: consolidate colored graph cmp logic 989eea958b lib-log-graph: consolidate test_cmp_graph logic bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching bb4995fc3f worktree: add utility to find worktree by pathname a80c4c2214 worktree: improve find_worktree() documentation 2fecc48cad packfile: drop nth_packed_object_sha1() 6ac9760a30 packed_object_info(): use object_id internally for delta base b99b6bcc57 packed_object_info(): use object_id for returning delta base 63f4a7fc01 pack-check: push oid lookup into loop e31c71083a pack-check: convert "internal error" die to a BUG() 500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps f66d4e0250 pack-objects: use object_id struct in pack-reuse code a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id 3f83fd5e44 pack-objects: read delta base oid into object_id struct 0763671b8e nth_packed_object_oid(): use customary integer return 02bbbe9df9 worktree: drop unused code from get_main_worktree() 27f182b3fc blame: provide type of fingerprints pointer b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere df126ca142 t3400: make test clean up after itself 3c29e21eb0 t: drop debug `cat` calls cac439b56d t9810: drop debug `cat` call 91de82adc9 t4117: check for files using `test_path_is_file` 4ef346482d receive.denyCurrentBranch: respect all worktrees f8692114db t5509: use a bare repository for test push target 45f274fbb1 get_main_worktree(): allow it to be called in the Git directory fd0bc17557 completion: add diff --color-moved[-ws] 2ce6d075fa use strpbrk(3) to search for characters from a given set 2b3c430bce quote: use isalnum() to check for alphanumeric characters a51d9e8f07 t1050: replace test -f with test_path_is_file 3e96c66805 partial-clone: avoid fetching when looking for objects d0badf8797 partial-clone: demonstrate bugs in partial fetch 539052f42f run-command.h: fix mis-indented struct member 6c11c6a124 sparse-checkout: allow one-character directories in cone mode aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch e8ef1e8d6e am: convert "resume" variable to a struct bc8620b440 parse-options: convert "command mode" to a flag 62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE() 46fd7b3900 credential: allow wildcard patterns when matching config 82eb249853 credential: use the last matching username in the config 588c70e10f t0300: add tests for some additional cases 732f934408 t1300: add test for urlmatch with multiple wildcards 3fa0e04667 mailmap: add an additional email address for brian m. carlson 8a98758a8d stash push: support the --pathspec-from-file option 8c3713cede stash: eliminate crude option parsing 3f3d8068f5 doc: stash: synchronize <pathspec> description b22909144c doc: stash: document more options 0093abc286 doc: stash: split options from description (2) 2b7460d167 doc: stash: split options from description (1) 5f393dc3aa rm: support the --pathspec-from-file option fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags 73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure 6c69f22233 bisect: libify `bisect_next_all` 9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents 45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents e8e3ce6718 bisect: libify `bisect_checkout` ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents 7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()` 680e8a01e5 bisect: add enum to represent bisect returning codes bfacfce7d9 bisect--helper: introduce new `decide_next()` function b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0 292731c4c2 bisect--helper: change `retval` to `res` 16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays 7ec8125fba check-ignore: fix documentation and implementation to match 2607d39da3 doc-diff: use single-colon rule in rendering Makefile 0aa6ce3094 doc/config/push: use longer "--" line for preformatted example 20a5fd881a rev-list --count: comment on the use of count_right++ 63a58457e0 Merge branch 'py/missing-bracket' 51ebf55b93 The sixth batch for 2.26 f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints' 123538444f Merge branch 'jk/doc-credential-helper' e154451a2f Merge branch 'js/mingw-open-in-gdb' fc25a19265 Merge branch 'js/test-unc-fetch' 6365058605 Merge branch 'js/test-avoid-pipe' 966b69f02f Merge branch 'js/test-write-junit-xml-fix' d880c3de23 Merge branch 'jk/mailinfo-cleanup' 5d55554b1d Merge branch 'mr/show-config-scope' 9f3f38769d Merge branch 'rs/strbuf-insertstr' cbecc168d4 Merge branch 'rs/parse-options-concat-dup' 5af345a438 Merge branch 'bc/hash-independent-tests-part-8' 0460c109c3 Merge branch 'rs/name-rev-memsave' 6b9919c0a2 git-gui: add missing close bracket 5897e5ac96 Merge branch 'cs/german-translation' cf85a32eb6 git-gui: update German translation 5096e51c54 git-gui: extend translation glossary template with more terms 8b85bb1b70 git-gui: update pot template and German translation to current source code e68e29171c Sync with 2.25.1 c522f061d5 Git 2.25.1 10cdb9f38a rebase: rename the two primary rebase backends 2ac0d6273f rebase: change the default backend from "am" to "merge" 8295ed690b rebase: make the backend configurable via config setting 76340c8107 rebase tests: repeat some tests using the merge backend instead of am 980b482d28 rebase tests: mark tests specific to the am-backend with --am c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases 6d04ce75c4 git-prompt: change the prompt for interactive-based rebases 52eb738d6b rebase: add an --am option 8af14f0859 rebase: move incompatibility checks between backend options a bit earlier be50c938df git-rebase.txt: add more details about behavioral differences of backends befb89ce7c rebase: allow more types of rebases to fast-forward 9a70f3d4ae t3432: make these tests work with either am or merge backends 93122c985a rebase: fix handling of restrict_revision 55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer 8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling 7db00f0b3b t3406: simplify an already simple test e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty d48e5e21da rebase (interactive-backend): make --keep-empty the default e0020b2f82 prefix_path: show gitdir when arg is outside repo cc4f2eb828 doc: move credential helper info into gitcredentials(7) bfdd66e72f Sync with maint 7ae7e234c7 The fifth batch for 2.26 53c3be2c29 Merge branch 'tb/commit-graph-object-dir' 7b029ebaef Merge branch 'jk/index-pack-dupfix' aa21cc97bd Merge branch 'jk/alloc-cleanups' 883326077a Merge branch 'jh/notes-fanout-fix' f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule' 78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs' df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' 433b8aac2e Merge branch 'ds/sparse-checkout-harden' 4a77434bc8 Merge branch 'ld/p4-cleanup-processes' 8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone' 09e48400a3 Merge branch 'jk/get-oid-error-message-i18n' 4dbeecba27 Merge branch 'ag/edit-todo-drop-check' f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2' d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout' 251187084d Merge branch 'js/rebase-i-with-colliding-hash' c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix' 56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store' 0da63da794 Merge branch 'jn/promote-proto2-to-default' a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup' daef1b300b Merge branch 'hw/advice-add-nothing' 6141e0cc00 Merge branch 'js/convert-typofix' into maint 4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint 5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint 7137d6089b Merge branch 'ms/doc-bundle-format' into maint 52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint 0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint 1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint 153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint 8857657cc9 Merge branch 'jt/t5616-robustify' into maint 1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint f468972671 Merge branch 'bc/misconception-doc' into maint 6e69042e26 Merge branch 'bc/author-committer-doc' into maint 650ed395be Merge branch 'ds/refmap-doc' into maint 80b806f1a8 Merge branch 'bc/actualmente' into maint eceff4ba12 Merge branch 'rt/submodule-i18n' into maint 8a17eb7972 Merge branch 'jk/test-fixes' into maint 54bbadaeca Merge branch 'jk/asan-build-fix' into maint 8dbeba198e Merge branch 'ds/sparse-cone' into maint e361f36f61 Merge branch 'nd/switch-and-restore' into maint 4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint 5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint 9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint 3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint 3ab3185f99 pack-objects: support filters with bitmaps 84243da129 pack-bitmap: implement BLOB_LIMIT filtering 4f3bd5606a pack-bitmap: implement BLOB_NONE filtering cc4aa28506 bitmap: add bitmap_unset() function 2aaeb9ac41 rev-list: use bitmap filters for traversal 6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure 4eb707ebd6 rev-list: allow commit-only bitmap traversals ea047a8eb4 t5310: factor out bitmap traversal comparison 608d9c9365 rev-list: allow bitmaps when counting objects 55cb10f9b5 rev-list: make --count work with --objects 792f811998 rev-list: factor out bitmap-optimized routines d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs 08809c09aa mingw: add a helper function to attach GDB to the current process bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths de26f02db1 t9001, t9116: avoid pipes a2dc43414c MyFirstContribution: rephrase contact info e03f928e2a rev-list: fallback to non-bitmap traversal when filtering acac50dd8c pack-bitmap: fix leak of haves/wants object lists 551cf8b655 pack-bitmap: factor out type iterator initialization d8437c57fa The fourth batch for 2.26 a3dcf84df0 Merge branch 'js/convert-typofix' 0de2d1409b Merge branch 'js/ci-squelch-doc-warning' 0410c2ba31 Merge branch 'jb/multi-pack-index-docfix' 0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example' e99c325bb4 Merge branch 'ms/doc-bundle-format' afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix' db72f8c940 Merge branch 'jb/parse-options-message-fix' 3d2471ba85 Merge branch 'ma/filter-branch-doc-caret' b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path' 44cba9c4b3 Merge branch 'jc/skip-prefix' 556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index' 17e4a1b141 Merge branch 'hw/doc-git-dir' 4cf7f48891 Merge branch 'jk/push-default-doc' b783391018 Merge branch 'jk/clang-sanitizer-fixes' a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache' 3f7553acf5 Merge branch 'jt/t5616-robustify' 341f8a6476 Merge branch 'jk/escaped-wildcard-dwim' b486d2ee81 Merge branch 'jn/pretend-object-doc' 076ee3e8a2 tests: fix --write-junit-xml with subshells 2b0f19fa7a convert: fix typo c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors 1751b09a92 color.c: support bright aixterm colors 4a28eb0ae4 color.c: refactor color_output arguments f696a2b1c8 mailinfo: factor out some repeated header handling ffbea1816d mailinfo: be more liberal with header whitespace f447d0293e mailinfo: simplify parsing of header values b6537d83ee mailinfo: treat header values as C strings ef07659926 sparse-checkout: work with Windows paths 2631dc879d sparse-checkout: create 'add' subcommand 4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand 6fb705abcb sparse-checkout: extract add_patterns_from_input() b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config f2a2327a4a config: provide access to the current line number 923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values ceff1a1308 remote: clean-up config callback 1a83068c26 remote: clean-up by returning early to avoid one indentation 88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types 145d59f482 config: add '--show-scope' to print the scope of a config value 9a83d088ee submodule-config: add subomdule config scope e37efa40e1 config: teach git_config_source to remember its scope 5c105a842e config: preserve scope in do_git_config_sequence 6766e41b8a config: clarify meaning of command line scoping 6dc905d974 config: split repo scope to local and worktree a5cb4204b6 config: make scope_name non-static and rename it 30183894ea ci: ignore rubygems warning in the "Documentation" job 7a9f8ca805 parse-options: simplify parse_options_dup() c84078573e parse-options: const parse_options_concat() parameters f904f9025f parse-options: factor out parse_options_count() a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat() 517b60564e mailinfo: don't insert header prefix for handle_content_type() a91cc7fad0 strbuf: add and use strbuf_insertstr() eb31044ff7 pack-format: correct multi-pack-index description 9299f84921 diff-options.txt: avoid "regex" overload in example 7378ec90e1 doc: describe Git bundle format f3037657e8 t6024: update for SHA-256 edf04243b2 t6006: make hash size independent 5db24dcffd t6000: abstract away SHA-1-specific constants d341e0805d t5703: make test work with SHA-256 88ed241a7e t5607: make hash size independent 48c10cc0e6 t5318: update for SHA-256 f7ae8e69b6 t5515: make test hash independent e70649bb66 t5321: make test hash independent a30f93b143 t5313: make test hash independent a79eec220b t5309: make test hash independent 796d1383a3 t5302: make hash size independent 417e45e5e3 t4060: make test work with SHA-256 dfa5f53e78 t4211: add test cases for SHA-256 f743e8f5b3 t4211: move SHA-1-specific test cases into a directory 72f936b120 t4013: make test hash independent 5df0f11f07 t3311: make test work with SHA-256 07877f393c t3310: make test work with SHA-256 6025e898d6 t3309: make test work with SHA-256 7b1a1822fe t3308: make test work with SHA-256 94db7e3e93 t3206: make hash size independent db12505c2c t/lib-pack: support SHA-256 303b3c1c46 submodule: add newline on invalid submodule error 887a0fd573 add: change advice config variables used by the add API de93cc14ab The third batch for 2.26 ea46d9097b Merge branch 'mt/sparse-checkout-doc-update' ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix' b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend' 7ab963e122 Merge branch 'en/fill-directory-fixes-more' f52ab33616 Merge branch 'bc/hash-independent-tests-part-7' 25794d6ce9 Merge branch 'km/submodule-add-errmsg' d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity' 76c57fedfa Merge branch 'js/add-p-leftover-bits' 9a5315edfd Merge branch 'js/patch-mode-in-others-in-c' 381e8e9de1 Merge branch 'dl/test-must-fail-fixes' 395518cf7a parse-options: lose an unnecessary space in an error message 079f970971 name-rev: sort tip names before applying 2d53975488 name-rev: release unused name strings 977dc1912b name-rev: generate name strings only if they are better 1c56fc2084 name-rev: pre-size buffer in get_parent_name() ddc42ec786 name-rev: factor out get_parent_name() f13ca7cef5 name-rev: put struct rev_name into commit slab d689d6d82f name-rev: don't _peek() in create_or_update_name() 15a4205d96 name-rev: don't leak path copy in name_ref() 36d2419c9a name-rev: respect const qualifier 71620ca86c name-rev: remove unused typedef 3e2feb0d64 name-rev: rewrite create_or_update_name() a21781011f index-pack: downgrade twice-resolved REF_DELTA to die() dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout e1c5253951 t3305: check notes fanout more carefully and robustly e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st' ad2dd5bb63 commit-graph.c: remove path normalization, comparison 13c2499249 commit-graph.h: store object directory in 'struct commit_graph' 0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context' f38c92452d t7400: testcase for submodule status on unregistered inner git repos 5290d45134 tree-walk.c: break circular dependency with unpack-trees f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode e53ffe2704 sparse-checkout: escape all glob characters on write e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand bd64de42de sparse-checkout: unquote C-style strings over --stdin d585f0e799 sparse-checkout: write escaped patterns in cone mode 4f52c2ce6c sparse-checkout: properly match escaped characters 9abc60f801 sparse-checkout: warn on globs in cone patterns 145136a95a C: use skip_prefix() to avoid hardcoded string length 04e5b3f0b4 submodule foreach: replace $path with $sm_path in example 1793280e91 t5318: don't pass non-object directory to '--object-dir' da8063522f diff: move diff.wsErrorHighlight to "basic" config b98d188581 sha1-file: allow check_object_signature() to handle any repo 2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file() 7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare() c8123e72f6 streaming: allow open_istream() to handle any repo 5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile() a651946730 cache-tree: use given repo's hash_algo at verify_one() eb999b3295 diff: make diff_populate_filespec() honor its repo argument 5b0ca878e0 Sync with maint 344ee18728 The second batch 53a83299c7 Merge branch 'bc/misconception-doc' c9ccf9d09b Merge branch 'bc/author-committer-doc' 0d0fa20c40 Merge branch 'ss/t6025-modernize' 7050624abc Merge branch 'lh/bool-to-type-bool' 4b69f29271 Merge branch 'ds/refmap-doc' aff812ce3c Merge branch 'bc/actualmente' 38fb56e92a Merge branch 'rt/submodule-i18n' f0940743fa Merge branch 'js/builtin-add-i-cmds' 0afeb3fdf4 Merge branch 'jk/test-fixes' 808dab2b58 Merge branch 'jk/asan-build-fix' fec1ff97c2 Merge branch 'sg/completion-worktree' c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function' 11ad30b887 Merge branch 'hi/gpg-mintrustlevel' 96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases' d52adee779 Merge branch 'ds/graph-horizontal-edges' 6909474491 Merge branch 'am/update-pathspec-f-f-tests' 043426c8fd Merge branch 'ds/sparse-cone' 34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig' 8dd40c0472 traverse_trees(): use stack array for name entries 667b76ec58 walker_fetch(): avoid raw array length computation 9734b74a8f normalize_path_copy(): document "dst" size expectations 43f33e492a git-p4: avoid leak of file handle when cloning 19fa5ac333 git-p4: check for access to remote host earlier 6026aff5bb git-p4: cleanup better on error exit ca5b5cce62 git-p4: create helper function importRevisions() 4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable 5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce 837b3a6376 git-p4: make closeStreams() idempotent b0418303b1 sha1-name: mark get_oid() error messages for translation 2df1aa239c fetch: forgo full connectivity check if --filter 50033772d5 connected: verify promisor-ness of partial clone d82ad54945 git: update documentation for --git-dir 0ad7144999 .mailmap: map Yi-Jyun Pan's email c56c48dd07 grep: ignore --recurse-submodules if --no-index is given 8b2a1928f0 doc: drop "explicitly given" from push.default description cf82bff73f obstack: avoid computing offsets from NULL pointer 3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer d20bc01a51 avoid computing zero offsets from NULL pointer 7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero bc3f657f71 t1506: drop space after redirection operator e5d7b2f65c t1400: avoid "test" string comparisons 5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c c7a6207591 Sync with maint 7210ca4ee5 .mailmap: fix GGG authoship screwup 37a63faae5 t4124: only mark git command with test_must_fail a8c663cf65 t3507: use test_path_is_missing() 2def7f017c t3507: fix indentation e8a1c686ae t3504: do check for conflict marker after failed cherry-pick 1c9fd32fd2 t3419: stop losing return code of git command c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}() a781cd6fef t3415: stop losing return codes of git commands 86ce6e0dd1 t3310: extract common notes_merge_files_gone() 245b9ba0ba t3030: use test_path_is_missing() 4a6f11fd7b t2018: replace "sha" with "oid" 62e80fcb48 t2018: don't lose return code of git commands 30c0367668 t2018: teach do_checkout() to accept `!` arg 40caa5366a t2018: be more discerning when checking for expected exit codes b54128bb0b t5616: make robust to delta base change 4c616c2ba1 merge-recursive: use subtraction to flip stage ee798742bd merge-recursive: silence -Wxor-used-as-pow warning 39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin 3b2885ec9b submodule: fix status of initialized but not cloned submodules ace912bfb8 t7400: add a testcase for submodule status on empty dirs 4bb4fd4290 MyFirstContribution: add avenues for getting help 9e6d3e6417 sparse-checkout: detect short patterns 41de0c6fbc sparse-checkout: cone mode does not recognize "**" 7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone 47dbf10d8a clone: fix --sparse option with URLs 3c754067a1 sparse-checkout: create leading directories d622c34396 t1091: improve here-docs 522e641748 t1091: use check_files to reduce boilerplate 417be08d02 t1300: create custom config file without special characters 3de7ee369b t1300: fix over-indented HERE-DOCs 329e6ec397 config: fix typo in variable name 767a9c417e rebase -i: stop checking out the tip of the branch to rebase dfaed02862 fsmonitor: update documentation for hook version and watchman hooks e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2 d031049da3 completion: add support for sparse-checkout a402723e48 doc: sparse-checkout: mention --cone option 26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck b6992261de rebase -i: re-fix short SHA-1 collision d859dcad94 parse_insn_line(): improve error message when parsing failed d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects 92fb0db94c pack-objects: add checks for duplicate objects bb514de356 pack-objects: improve partial packfile reuse ff483026a9 builtin/pack-objects: introduce obj_is_packed() e704fc7978 pack-objects: introduce pack.allowPackReuse 2f4af77699 csum-file: introduce hashfile_total() 8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting() 59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile 40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains() 14fbd26044 ewah/bitmap: introduce bitmap_word_alloc() bc7a3d4dc0 The first batch post 2.25 cycle 09e393d913 Merge branch 'nd/switch-and-restore' 45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' 0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout' 36da2a8635 Merge branch 'es/unpack-trees-oob-fix' 42096c778d Merge branch 'bc/run-command-nullness-after-free-fix' 1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted' a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees' e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached' 9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting' 237a83a943 Merge branch 'dl/credential-netrc' a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir() 129510a067 t2405: clarify test descriptions and simplify test 4eaadc8493 t2405: use git -C and test_commit -C instead of subshells 773c60a45e t7410: rename to t2405-worktree-submodule.sh 7a2dc95cbc docs: mention when increasing http.postBuffer is valuable 1b13e9032f doc: dissuade users from trying to ignore tracked files 69e104d70e doc: provide guidance on user.name format 813f6025a5 docs: expand on possible and recommended user config options bc94e5862a doc: move author and committer information to git-commit(1) 7979dfe1d4 l10n: Update Catalan translation 81e3db42f3 templates: fix deprecated type option `--bool` c513a958b6 t6025: use helpers to replace test -f <path> 70789843bd t6025: modernize style 6a7aca6f01 doc: rm: synchronize <pathspec> description 856249c62a docs: use "currently" for the present time b40a50264a fetch: document and test --refmap="" a9ae8fde2e t3404: directly test the behavior of interest 22a69fda19 git-rebase.txt: update description of --allow-empty-message f1928f04b2 grep: use no. of cores as the default no. of threads 70a9fef240 grep: move driver pre-load out of critical section 1184a95ea2 grep: re-enable threads in non-worktree case 6c307626f1 grep: protect packed_git [re-]initialization c441ea4edc grep: allow submodule functions to run in parallel d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules() 1d1729caeb grep: replace grep_read_mutex by internal obj read lock 31877c9aec object-store: allow threaded access to object reading b1fc9da1c8 replace-object: make replace operations thread-safe d5b0bac528 grep: fix racy calls in grep_objects() faf123c730 grep: fix race conditions at grep_submodule() c3a5bb31c1 grep: fix race conditions on userdiff calls 0222540827 fetch: emphasize failure during submodule fetch 232378479e Sync with maint e4837b4406 t7800: don't rely on reuse_worktree_file() fbce03d329 t4018: drop "debugging" cat from hunk-header tests f65d07fffa Makefile: use compat regex with SANITIZE=address 849e43cc18 built-in add -i: accept open-ended ranges again d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files a4ffbbbb99 submodule.c: mark more strings for translation 0cbb60574e dir: point treat_leading_path() warning to the right place ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent 22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2 f365bf40a0 clean: demonstrate a bug with pathspecs b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x 277eb5af7c t5604: make hash independent 44b6c05b43 t5601: switch into repository to hash object 7a868c51c2 t5562: use $ZERO_OID 1b8f39fb0d t5540: make hash size independent a8c17e3bd6 t5537: make hash size independent 832072219c t5530: compute results based on object length 74ad99b1d8 t5512: abstract away SHA-1-specific constants ba1be1ab45 t5510: make hash size independent cba472d3ad t5504: make hash algorithm independent 82d5aeb1e6 t5324: make hash size independent 3c5e65cac1 t5319: make test work with SHA-256 235d3cddb8 t5319: change invalid offset for SHA-256 compatibility 1d86c8f0ce t5318: update for SHA-256 525a7f1769 t4300: abstract away SHA-1-specific constants 7a1bcb251b t4204: make hash size independent cb78f4f0fe t4202: abstract away SHA-1-specific constants 717c939d8f t4200: make hash size independent 08a9dd891c t4134: compute appropriate length constant 215b60bf07 t4066: compute index line in diffs 194264c185 t4054: make hash-size independent 7d5ecd775d completion: list paths and refs for 'git worktree add' 3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands 3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options 367efd54b3 completion: return the index of found word from __git_find_on_cmdline() d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function 2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper 54887b4689 gpg-interface: add minTrustLevel as a configuration option 684ceae32d fetch: default to protocol version 2 33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION 8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate b9ab170752 config doc: protocol.version is not experimental 07ef3c6604 fetch test: use more robust test for filtered objects d6509da620 fetch test: mark test of "skipping" haves as v0-only a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function bf66db37f1 add: use advise function to display hints c958d3bd0a graph: fix collapse of multiple edges 8588932e20 graph: add test to demonstrate horizontal line bug d0d0a357a1 t: directly test parse_pathspec_file() 568cabb2fe t: fix quotes tests for --pathspec-from-file f94f7bd00d t: add tests for error conditions with --pathspec-from-file b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job 12acdf573a built-in add -p: handle Escape sequences more efficiently e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode 04f816b125 built-in add -p: respect the `interactive.singlekey` config setting a5e46e6b01 terminal: add a new function to read a single keystroke 9ea416cb51 terminal: accommodate Git for Windows' default terminal 94ac3c31f7 terminal: make the code of disable_echo() reusable 08b1ea4c39 built-in add -p: handle diff.algorithm 180f48df69 built-in add -p: support interactive.diffFilter 1e4ffc765d t3701: adjust difffilter test c81638541c submodule add: show 'add --dry-run' stderr when aborting 8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token 56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token d0654dc308 Git 2.25 b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po 4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'" ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1 e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master 1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' d78a1968c5 Merge branch 'ma/config-advice-markup-fix' a20ae3ee29 l10n: Update Catalan translation 49e268e23e mingw: safeguard better against backslashes in file names 4c6c7971e0 unpack-trees: correctly compute result count 63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1 75449c1b39 l10n: de.po: Reword generation numbers 6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t) 3901d2c6bd config/advice.txt: fix description list separator 7a6a90c6ec Git 2.25-rc2 1f5f3ffe5c Merge branch 'ds/graph-assert-fix' a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix' 202f68b252 Merge branch 'pm/am-in-body-header-doc-update' 7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix' c5dc20638b Merge branch 'do/gitweb-typofix-in-comments' fe47c9cb5f Merge https://github.com/prati0100/git-gui a1087c9367 graph: fix lack of color in horizontal lines 0d251c3291 graph: drop assert() for merge with two collapsing parents 4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper 573117dfa5 unpack-trees: watch for out-of-range index position e701bab3e9 restore: invalidate cache-tree when removing entries with --staged 1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command fa74180d08 checkout: don't revert file on ambiguous tracking branches 2957709bd4 parse_branchname_arg(): extract part as new function 5020f6806a t2018: improve style of if-statement 7ffb54618b t2018: add space between function name and () 63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH 065027ee1a string-list: note in docs that callers can specify sorting function 26f924d50e unpack-trees: exit check_updates() early if updates are not wanted 042ed3e048 The final batch before -rc2 0f1930cd1b Merge branch 'ds/sparse-cone' 037f067587 Merge branch 'ds/commit-graph-set-size-mult' f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify' c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode' a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' c4117fcb97 Merge branch 'pb/clarify-line-log-doc' 556f0258df Merge branch 'ew/packfile-syscall-optim' 5814d44d9b doc: submodule: fix typo for command absorbgitdirs 7047f75f22 editorconfig: indent text files with tabs 60440d72db sha1-file: document how to use pretend_object_file 7fdc5f296f l10n: es: 2.25.0 round #1 f8740c586b am: document that Date: can appear as an in-body header 4e2c4c0d4f gitweb: fix a couple spelling errors in comments 421c0ffb02 multi-pack-index: correct configuration in documentation 757ff352bd Documentation/git-sparse-checkout.txt: fix a typo 0d2116c644 Merge branch 'zs/open-current-file' 9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u) 3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master 4c5081614c l10n: fr.po v2.25.0 rnd 1 5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0 63020f175f commit-graph: prefer default size_mult when given zero 224c7d70fa mingw: only test index entries for backslashes, not tree entries 9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED 8679ef24ed Git 2.25-rc1 a82027e9e6 Merge branch 'js/use-test-tool-on-path' 13432fc6dd Merge branch 'js/mingw-reserved-filenames' e0e1ac5db0 Merge branch 'en/rebase-signoff-fix' b76a244c9d Merge branch 'em/freebsd-cirrus-ci' bc855232bc Merge branch 'bk/p4-misc-usability' 763a59e71c merge-recursive: remove unnecessary oid_eq function 44143583b7 sparse-checkout: use extern for global variables d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master 13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1 786f4d2405 git-gui: allow opening currently selected file in default app 4fd683b6a3 sparse-checkout: document interactions with submodules de11951b03 sparse-checkout: list directories in cone mode 0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0 578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) 173fff68da Merge tag 'v2.25.0-rc0' into git-po-master f1842ff531 t2018: remove trailing space from test description 20a67e8ce9 t3008: find test-tool through path lookup 9e341f62ca l10n: Update Catalan translation 4e61b2214d packfile: replace lseek+read with pread ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision 2be45868a8 doc: log, gitk: document accepted line-log diff formats 280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD 0a76bd7381 mailmap: mask accentless variant for Công Danh 99c33bed56 Git 2.25-rc0 d2189a721c Merge branch 'en/fill-directory-fixes' 8be0a428d6 Merge branch 'rs/test-cleanup' 65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string' c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 45b96a6fa1 Merge branch 'js/add-p-in-c' ccc292e862 Merge branch 'jc/drop-gen-hdrs' dfee504bee Merge branch 'ja/doc-markup-cleanup' 87cbb1ca66 Merge branch 'rs/ref-read-cleanup' 20aa6d88b7 Merge branch 'rb/p4-lfs' fcd5b55f56 Merge branch 'pb/submodule-doc-xref' 4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free' ba6b66281e Merge branch 'ln/userdiff-elixir' bd72a08d6c Merge branch 'ds/sparse-cone' f3c520e17f Merge branch 'sg/name-rev-wo-recursion' 6514ad40a1 Merge branch 'ra/t5150-depends-on-perl' 17066bea38 Merge branch 'dl/format-patch-notes-config-fixup' 135365dd99 Merge branch 'am/pathspec-f-f-checkout' ff0cb70d45 Merge branch 'am/pathspec-from-file' 4dc42c6c18 mingw: refuse paths containing reserved names 98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16 c480eeb574 commit --interactive: make it work with the built-in `add -i` cee6cb7300 built-in add -p: implement the "worktree" patch modes 52628f94fc built-in add -p: implement the "checkout" patch modes 6610e4628a built-in stash: use the built-in `git add -p` if so configured 90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting 36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes d2a233cb8b built-in add -p: prepare for patch modes other than "stage" 761e3d26bb sparse-checkout: improve OS ls compatibility 6579d93a97 contrib/credential/netrc: work outside a repo 1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI b441717256 t1507: inline full_name() 9291e6329e t1507: run commands within test_expect_success 5236fce6b4 t1507: stop losing return codes of git commands 10812c2337 t1501: remove use of `test_might_fail cp` 62d58cda69 t1409: use test_path_is_missing() b87b02cfe6 t1409: let sed open its own input file 9b92070e52 t1307: reorder `nongit test_must_fail` 3595d10c26 t1306: convert `test_might_fail rm` to `rm -f` f511bc02ed t0020: use ! check_packed_refs_marked f6041abdcd t0020: don't use `test_must_fail has_cr` f46c243e66 t0003: don't use `test_must_fail attr_check` 99c049bc4c t0003: use test_must_be_empty() 3738439c77 t0003: use named parameters in attr_check() 7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err() b8afb908c2 t/lib-git-p4: use test_path_is_missing() 4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases 6836d2fe06 dir.c: use st_add3() for allocation size c847dfafee dir: consolidate similar code in treat_directory() 777b420347 dir: synchronize treat_leading_path() and read_directory_recursive() b9670c1f5e dir: fix checks on common prefix directory 5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit 23cbe427c4 Merge branch 'py/console-close-esc' 124a895811 t4015: improve coverage of function context test 509efef789 commit: forbid --pathspec-from-file --all 12029dc57d t3434: mark successful test as such e0f9095aaa notes.h: fix typos in comment 675ef6bab8 t6030: don't create unused file 01ed17dc8c t5580: don't create unused file f670adb49b t3501: don't create unused file 1e1ccbfdd3 git-gui: allow closing console window with Escape 7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays. b02fd2acca The sixth batch 59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex' e3b72391d1 Merge branch 'rs/commit-export-env-simplify' 43bf44e23a Merge branch 'rs/archive-zip-code-cleanup' 4438a1a59f Merge branch 'js/t3404-indent-fix' 3a44db2ed2 Merge branch 'dr/branch-usage-casefix' 8bc481f4f6 Merge branch 'sg/t9300-robustify' 011fc2e88e Merge branch 'js/add-i-a-bit-more-tests' d1c0fe8d9b Merge branch 'dl/range-diff-with-notes' 26c816a67d Merge branch 'hw/doc-in-header' f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 71a7de7a99 Merge branch 'dl/rebase-with-autobase' c9f5fc9114 Merge branch 'dl/test-cleanup' 6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap' 3beff388b2 Merge branch 'js/builtin-add-i-cmds' 4755a34c47 Merge branch 'dd/time-reentrancy' 37c2619d91 Merge branch 'ag/sequencer-todo-updates' 608e380502 git-p4: show detailed help when parsing options fail e2aed5fd5b git-p4: yes/no prompts should sanitize user text 571fb96573 fix-typo: consecutive-word duplications f371984613 Makefile: drop GEN_HDRS 2e4083198d built-in add -p: show helpful hint when nothing can be staged 54d9d9b2ee built-in add -p: only show the applicable parts of the help text ade246efed built-in add -p: implement the 'q' ("quit") command d6cf873340 built-in add -p: implement the '/' ("search regex") command 9254bdfb4f built-in add -p: implement the 'g' ("goto") command bcdd297b78 built-in add -p: implement hunk editing b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf" 11f2c0dae8 built-in add -p: coalesce hunks after splitting them 510aeca199 built-in add -p: implement the hunk splitting feature 0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions 5906d5de77 built-in app -p: allow selecting a mode change as a "hunk" 47dc4fd5eb built-in add -p: handle deleted empty files 80399aec5a built-in add -p: support multi-file diffs 7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed 12c24cf850 built-in add -p: color the prompt and the help text 25ea47af49 built-in add -p: adjust hunk headers as needed e3bd11b4eb built-in add -p: show colored hunks by default 1942ee44e8 built-in add -i: wire up the new C code for the `patch` command f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C d1b1384d61 userdiff: remove empty subexpression from elixir regex df5be01669 doc: indent multi-line items in list fd5041e127 doc: remove non pure ASCII characters 190a65f9db sparse-checkout: respect core.ignoreCase in cone mode 1d7297513d notes: break set_display_notes() into smaller functions 66f79ee23d config/format.txt: clarify behavior of multiple format.notes cc2bd5c45d gitmodules: link to gitsubmodules guide 99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed 8c02fe6060 t7004: don't create unused file cb05d6a5ed t4256: don't create unused file c5c4eddd56 dir: break part of read_directory_recursive() out for reuse 072a231016 dir: exit before wildcard fall-through if there is no wildcard 2f5d3847d4 dir: remove stray quote character in comment a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories" 452efd11fb t3011: demonstrate directory traversal failures ea94b16fb8 git-p4: honor lfs.storage configuration variable 51a0a4ed95 bisect--helper: avoid use-after-free d32e065a91 Merge branch 'kk/branch-name-encoding' ad05a3d8e5 The fifth batch 7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix' b089e5e6cb Merge branch 'em/test-skip-regex-illseq' 930078ba39 Merge branch 'hi/gpg-use-check-signature' 08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode' 7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk' 55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm' 41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress' 5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise' dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix' d37cfe3b5c Merge branch 'dl/pretty-reference' 99c4ff1bda Merge branch 'dl/submodule-set-url' 55d607d85b Merge branch 'js/mingw-inherit-only-std-handles' c58ae96fc4 Merge branch 'am/pathspec-from-file' 7c88714262 Merge branch 'po/bundle-doc-clonable' 5d9324e0f4 Merge branch 'ra/rebase-i-more-options' 7034cd094b Sync with Git 2.24.1 09ac67a183 format-patch: move git_config() before repo_init_revisions() 8164c961e1 format-patch: use --notes behavior for format.notes 452538c358 notes: extract logic into set_display_notes() e6e230eeae notes: create init_display_notes() helper 1e6ed5441a notes: rename to load_display_notes() 2866fd284c name-rev: cleanup name_ref() 49f7a2fde9 name-rev: eliminate recursion in name_rev() fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name' e05e8cf074 archive-zip: use enum for compression method 39acfa3d22 git gui: fix branch name encoding error 11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description 8cf8f9b4aa t3404: fix indentation 4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs 147ee35558 commit: use strbuf_add() to add a length-limited string 559c6fc317 The fourth batch 56e6c16394 Merge branch 'dl/lore-is-the-archive' 3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive' 7cb0d37f6d Merge branch 'tg/perf-remove-stale-result' 403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick' f0cf2fee5d Merge branch 'hi/grep-do-not-return-void' 391fb22ac7 Merge branch 'rs/use-skip-prefix-more' 92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd' 4ba74ca901 Merge branch 'rs/test-cleanup' f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick' ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9' 8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters 3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances dd432a6ecf name-rev: restructure parsing commits and applying date cutoff dd090a8a37 name-rev: pull out deref handling from the recursion 766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev() bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation e0c4da6f2a name-rev: avoid unnecessary cast in name_ref() c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name() c593a26348 t6120-describe: modernize the 'check_describe' helper abcf857300 range-diff: clear `other_arg` at end of function f8675343d7 range-diff: mark pointers as const 828765dfe0 t3206: fix incorrect test name 0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early 21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile b4bbbbd5a2 apply --allow-overlap: fix a corner case 89c8559367 git add -p: use non-zero exit code when the diff generation failed e91162be9c t3701: verify that the diff.algorithm config setting is handled 0c3222c4f3 t3701: verify the shown messages when nothing can be added 24be352d52 t3701: add a test for the different `add -p` prompts 8539b46534 t3701: avoid depending on the TTY prerequisite 0f0fba2cc8 t3701: add a test for advanced split-hunk editing 53a06cf39b Git 2.24.1 67af91c47a Sync with 2.23.1 a7312d1a28 Git 2.23.1 7fd9fd94fb Sync with 2.22.2 d9589d4051 Git 2.22.2 5421ddd8d0 Sync with 2.21.1 367f12b7e9 Git 2.21.1 20c71bcf67 Merge branch 'fix-msys2-quoting-bugs' 7d8b676992 mingw: sh arguments need quoting in more circumstances d9061ed9da t7415: drop v2.20.x-specific work-around 04522edbd4 mingw: fix quoting of empty arguments for `sh` 49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly fc346cb292 Sync with 2.20.2 4cd1cf31ef Git 2.20.2 c154745074 submodule: defend against submodule.update = !command in .gitmodules 4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x d851d94151 Sync with 2.19.3 caccc527ca Git 2.19.3 7c9fbda6e2 Sync with 2.18.2 9877106b01 Git 2.18.2 14af7ed5a9 Sync with 2.17.3 a5ab8d0317 Git 2.17.3 bb92255ebe fsck: reject submodule.update = !command in .gitmodules bdfef0492c Sync with 2.16.6 eb288bc455 Git 2.16.6 68440496c7 test-drop-caches: use `has_dos_drive_prefix()` 9ac92fed5b Sync with 2.15.4 7cdafcaacf Git 2.15.4 e904deb89d submodule: reject submodule.update = !command in .gitmodules d3ac8c3f27 Sync with 2.14.6 66d2a6159f Git 2.14.6 083378cc35 The third batch 88bd37a2d0 Merge branch 'js/pkt-line-h-typofix' 473b431410 Merge branch 'us/unpack-trees-fsmonitor' e0f9ec9027 Merge branch 'sg/test-bool-env' fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset' e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere' 88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory' 8feb47e882 Merge branch 'dl/t5520-cleanup' 6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree' 57d46bc602 Merge branch 'mg/doc-submodule-status-cached' 75bd003c7b Merge branch 'js/git-svn-use-rebase-merges' f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix' c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits' 36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree' cf91c31688 Merge branch 'sg/unpack-progress-throughput' ef6104581d Merge branch 'pb/submodule-update-fetches' 7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix' f3c7bfdde2 Merge branch 'dl/range-diff-with-notes' 9502b616f1 Merge branch 'jh/userdiff-python-async' 76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2' 995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label' f7998d9793 Merge branch 'js/builtin-add-i' 917d0d6234 Merge branch 'js/rebase-r-safer-label' 56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers' 2763530048 Merge branch 'jg/revert-untracked' fa38ab68b0 git-gui: revert untracked files by deleting them d9c6469f38 git-gui: update status bar to track operations 29a9366052 git-gui: consolidate naming conventions 0bb313a552 xdiff: unignore changes in function context 2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names' 65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods' 5532ebdeb7 Merge branch 'fix-mingw-quoting-bug' 76a681ce9c Merge branch 'dubiously-nested-submodules' dd53ea7220 Merge branch 'turn-on-protectntfs-by-default' f82a97eb91 mingw: handle `subst`-ed "DOS drives" 7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams' d2c84dad1c mingw: refuse to access paths with trailing spaces or periods 379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh 817ddd64c2 mingw: refuse to access paths with illegal characters cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors 7530a6287e quote-stress-test: allow skipping some trials 35edce2056 t6130/t9350: prepare for stringent Win32 path validation 55953c77c0 quote-stress-test: accept arguments to test via the command-line ad15592529 tests: add a helper to stress test argument quoting a8dee3ca61 Disallow dubiously-nested submodule git directories 9102f958ee protect_ntfs: turn on NTFS protection by default 91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams 6d8684161e mingw: fix quoting of arguments 3a85dc7d53 is_ntfs_dotgit(): speed it up 7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses 288a74bcd2 is_ntfs_dotgit(): only verify the leading segment a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark cae0bc09ab rebase: fix format.useAutoBase breakage 945dc55dda format-patch: teach --no-base 700e006c5d t4014: use test_config() a749d01e1d format-patch: fix indentation 0c47e06176 t3400: demonstrate failure with format.useAutoBase d9b31db2c4 t7700: stop losing return codes of git commands 3699d69df0 t7700: make references to SHA-1 generic dcf9a748ca t7700: replace egrep with grep cfe5eda02a t7700: consolidate code into test_has_duplicate_object() ae475afc0f t7700: consolidate code into test_no_missing_in_packs() 14b7664df8 doc: replace LKML link with lore.kernel.org d23f9c8e04 RelNotes: replace Gmane with real Message-IDs dcee037228 doc: replace MARC links with lore.kernel.org a9aecc7abb checkout, restore: support the --pathspec-from-file option cfd9376c1d doc: restore: synchronize <pathspec> description 8ea1189eac doc: checkout: synchronize <pathspec> description 6fdc9ad259 doc: checkout: fix broken text reference 1d022bb43f doc: checkout: remove duplicate synopsis bebb5d6d6b add: support the --pathspec-from-file option 21bb3083c3 cmd_add: prepare for next patch 4778452597 Merge branch 'prevent-name-squatting-on-windows' a7b1ad3b05 Merge branch 'jk/fast-import-unsafe' 525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()` e1d911dd4c mingw: disallow backslash characters in tree objects' file names 0060fd1511 clone --recurse-submodules: prevent name squatting on Windows a52ed76142 fast-import: disallow "feature import-marks" by default 68061e3470 fast-import: disallow "feature export-marks" by default 019683025f fast-import: delay creating leading directories for export-marks e075dba372 fast-import: stop creating leading directories for import-marks 11e934d56e fast-import: tighten parsing of boolean command line options 816f806786 t9300: create marks files for double-import-marks test f94804c1f2 t9300: drop some useless uses of cat 4f3e57ef13 submodule--helper: advise on fatal alternate error 10c64a0b3c Doc: explain submodule.alternateErrorStrategy ec48540fe8 packfile.c: speed up loading lots of packfiles 3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value a4fb016ba1 pkt-line: fix a typo 0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data 228f53135a The second batch 6c630f237e Merge branch 'jk/gitweb-anti-xss' 3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell' 4775e02a5c Merge branch 'ma/t7004' a6c6f8d02a Merge branch 'js/complete-svn-recursive' 3ae8defaf9 Merge branch 'jk/send-pack-remote-failure' aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix' 4ab9616c76 Merge branch 'sg/skip-skipped-prereq' 723a8adba5 Merge branch 'ds/test-read-graph' 9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation' 406ca29e0d Merge branch 'rs/parse-options-dup-null-fix' fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging' 8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion' ef8f621045 Merge branch 'dl/complete-rebase-onto' 3c3e5d0ea2 Merge branch 'tg/stash-refresh-index' 43c5fe1c1d Merge branch 'nn/doc-rebase-merges' 6511cb33c9 Merge branch 'dd/sequencer-utf8' f165457618 Merge branch 'jk/remove-sha1-to-hex' a774064fb0 Merge branch 'dj/typofix-merge-strat' ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates' d2489ce92c Merge branch 'rs/skip-iprefix' 376e7309e1 Merge branch 'ln/userdiff-elixir' 9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log' d3096d2ba6 Merge branch 'en/doc-typofix' 26f20fa3fc Merge branch 'ns/test-desc-typofix' ffd130a363 Merge branch 'en/t6024-style' 5149902ff9 Merge branch 'en/misc-doc-fixes' bcb06e204c Merge branch 'js/fetch-multi-lockfix' d08daec001 Merge branch 'rs/trace2-dots' fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix' bad5ed39cd Merge branch 'cb/curl-use-xmalloc' 7ab2088255 Merge branch 'rt/fetch-message-fix' f089ddd56a Merge branch 'es/myfirstcontrib-updates' 3c90710c0c Merge branch 'hw/config-doc-in-header' d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code' 5444d52866 Merge branch 'js/vreportf-wo-buffering' 05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add' ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides' 532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default' dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists' fac9ab1419 Merge branch 'ma/bisect-doc-sample-update' a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix' 0be5caf97c Merge branch 'jc/log-graph-simplify' 0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck' 2e697ced9d built-in add -i: offer the `quit` command d7633578b5 built-in add -i: re-implement the `diff` command 8746e07277 built-in add -i: implement the `patch` command ab1e1cccaf built-in add -i: re-implement `add-untracked` in C c54ef5e424 built-in add -i: re-implement `revert` in C a8c45be939 built-in add -i: implement the `update` command f37c226454 built-in add -i: prepare for multi-selection commands c08171d156 built-in add -i: allow filtering the modified files list 0c3944a628 add-interactive: make sure to release `rev.prune_data` 4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance 867fc7f310 grep: don't return an expression from pcre2_free() c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables 72b006f4bf gpg-interface: prefer check_signature() for GPG verification 7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r ccd469450a date.c: switch to reentrant {gm,local}time_r 271c351b2f t7811: don't create unused file 65efb42862 t9300: don't create unused file f6b9413baf sequencer: fix a memory leak in sequencer_continue() 3eae30e464 doc: replace public-inbox links with lore.kernel.org 46c67492aa doc: recommend lore.kernel.org over public-inbox.org 5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects 17a4ae92ea t7700: s/test -f/test_path_is_file/ d2eee32a89 t7700: move keywords onto their own line 7a1c8c2346 t7700: remove spaces after redirect operators 09279086e8 t7700: drop redirections to /dev/null 756ee7fc9f t7501: stop losing return codes of git commands 38c1aa01de t7501: remove spaces after redirect operators 763b47bafa t5703: stop losing return codes of git commands eacaa1c180 t5703: simplify one-time-sed generation logic a29b2429e5 t5317: use ! grep to check for no matching lines 6c37f3ec1b t5317: stop losing return codes of git commands b66e0a1773 t4138: stop losing return codes of git commands afd43c9905 t4015: use test_write_lines() 946d2353a3 t4015: stop losing return codes of git commands 50cd31c652 t3600: comment on inducing SIGPIPE in `git rm` 3b737381d8 t3600: stop losing return codes of git commands 0d913dfa7e t3600: use test_line_count() where possible 29a40b5a67 t3301: stop losing return codes of git commands 9b5a9fa60a t0090: stop losing return codes of git commands 17aa9d9c1a t0014: remove git command upstream of pipe 77a946be98 apply-one-time-sed.sh: modernize style 176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job ed254710ee test: use test_must_be_empty F instead of test_cmp empty F c74b3cbb83 t7812: add missing redirects 213dabf49d test: use test_must_be_empty F instead of test -z $(cat F) c93a5aaec8 t1400: use test_must_be_empty 6e4826ea75 t1410: use test_line_count a5d04a3ef9 t1512: use test_line_count 54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd() 2059e79c0d name-rev: use skip_prefix() instead of starts_with() 1768aaf01d push: use skip_prefix() instead of starts_with() ec6ee0c07a shell: use skip_prefix() instead of starts_with() 7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with() a6293f5d28 fetch: use skip_prefix() instead of starts_with() 13ca8fb79e t5150: skip request-pull test if Perl is disabled ecc0869080 commit-graph: use start_delayed_progress() 44a4693bfc progress: create GIT_PROGRESS_DELAY 528d9e6d01 t/perf: don't depend on Git.pm b8dcc45387 perf-lib: use a single filename for all measurement types fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk' d82dfa7f5b rebase -i: finishing touches to --reset-author-date 1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory 393adf7a6f sequencer: directly call pick_commits() from complete_action() a2dd67f105 rebase: fill `squash_onto' in get_replay_opts() 3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function 34065541e3 sequencer: update `done_nr' when skipping commands in a todo list 8638114e06 sequencer: update `total_nr' when adding an item to a todo list 0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions 9917eca794 l10n: zh_TW: add translation for v2.24.0 0a8e3036a3 reset: parse rev as tree-ish in patch mode f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits 8d483c8408 doc: document 'git submodule status --cached' befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later 9a780a384d mingw: spawned processes need to inherit only standard handles c5a03b1e29 mingw: work around incorrect standard handles eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool 43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values 2d05ef2778 sequencer: fix empty commit check when amending ea8b7be147 git svn: stop using `rebase --preserve-merges` 67a6ea6300 gpg-interface: limit search for primary key fingerprint 392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern cff4e9138d sparse-checkout: check for dirty status 416adc8711 sparse-checkout: update working directory in-process for 'init' f75a69f880 sparse-checkout: cone mode should not interact with .gitignore fb10ca5b54 sparse-checkout: write using lockfile 99dfa6f970 sparse-checkout: use in-process update for disable subcommand e091228e17 sparse-checkout: update working directory in-process e9de487aa3 sparse-checkout: sanitize for nested folders 4dcd4def3c unpack-trees: add progress to clear_ce_flags() eb42feca97 unpack-trees: hash less in cone mode af09ce24a9 sparse-checkout: init and set in cone mode 96cc8ab531 sparse-checkout: use hashmaps for cone patterns 879321eb0b sparse-checkout: add 'cone' mode e6152e35ff trace2: add region in clear_ce_flags 72918c1ad9 sparse-checkout: create 'disable' subcommand 7bffca95ea sparse-checkout: add '--stdin' option to set subcommand f6039a9423 sparse-checkout: 'set' subcommand d89f09c828 clone: add --sparse mode bab3c35908 sparse-checkout: create 'init' subcommand 94c0956b60 sparse-checkout: create builtin with 'list' subcommand 679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files df6d3d6802 lib-bash.sh: move `then` onto its own line 2a02262078 t5520: replace `! git` with `test_must_fail git` c245e58bb6 t5520: remove redundant lines in test cases a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp e959a18ee7 t5520: don't put git in upstream of pipe 5540ed27bc t5520: test single-line files by git with test_cmp dd0f1e767b t5520: use test_cmp_rev where possible 979f8891cc t5520: replace test -{n,z} with test-lib functions 3037d3db90 t5520: use test_line_count where possible 93a9bf876b t5520: remove spaces after redirect operator ceeef863de t5520: replace test -f with test-lib functions 4c8b046f82 t5520: let sed open its own input 53c62b9810 t5520: use sq for test case names e8d1eaf9b4 t5520: improve test style 2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals 8cb7980382 t0000: test multiple local assignment 5b583e6a09 format-patch: pass notes configuration to range-diff bd36191886 range-diff: pass through --notes to `git log` 9f726e1b87 range-diff: output `## Notes ##` header 3bdbdfb7a5 t3206: range-diff compares logs with commit notes 75c5aa0701 t3206: s/expected/expect/ 79f3950d02 t3206: disable parameter substitution in heredoc 3a6e48e9f7 t3206: remove spaces after redirect operators 26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish 077a1fda82 userdiff: support Python async functions 3798149a74 SubmittingPatches: use `--pretty=reference` 1f0fc1db85 pretty: implement 'reference' format 618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type 0df621172d pretty: provide short date format ac52d9410e t4205: cover `git log --reflog -z` blindspot 3e8ed3b93e pretty.c: inline initalize format_context 4982516451 revision: make get_revision_mark() return const pointer f0f9de2bd7 completion: complete `tformat:` pretty format fb2ffa77a6 SubmittingPatches: remove dq from commit reference bae74c9dfb pretty-formats.txt: use generic terms for hash bd00717eab SubmittingPatches: use generic terms for hash 9d45ac4cbf rev-list-options.txt: remove reference to --show-notes 828e829b9e argv-array: add space after `while` e440fc5888 commit: support the --pathspec-from-file option 66a25a7242 doc: commit: synchronize <pathspec> description 64bac8df97 reset: support the `--pathspec-from-file` option d137b50756 doc: reset: synchronize <pathspec> description 24e4750c96 pathspec: add new function to parse file 0dbc4a0edf ci(osx): update homebrew-cask repository with less noise e02058a729 sequencer: handle rebase-merges for "onto" message bae60ba7e9 builtin/unpack-objects.c: show throughput progress 2d92ab32fd rev-parse: make --show-toplevel without a worktree an error 9e5afdf997 fetch: add trace2 instrumentation 4c4066d95d run-command: move doc to run-command.h 6c51cb525d trace2: move doc to trace2.h 7db0305438 parse-options: add link to doc file in parse-options.h d95a77d059 submodule-config: move doc to submodule-config.h f3b9055624 credential: move doc to credential.h bbcfa3002a tree-walk: move doc to tree-walk.h 971b1f24a2 argv-array: move doc to argv-array.h f1ecbe0f53 trace: move doc to trace.h 13aa9c8b70 cache: move doc to cache.h c0be43f898 sigchain: move doc to sigchain.h 19ef3ddd36 pathspec: move doc to pathspec.h 301d595e72 revision: move doc to revision.h 3a1b3415d9 attr: move doc to attr.h 126c1ccefb refs: move doc to refs.h d27eb356bf remote: move doc to remote.h and refspec.h 405c6b1fbc sha1-array: move doc to sha1-array.h d3d7172e40 merge: move doc to ll-merge.h 3f1480b745 graph: move doc to graph.h and graph.c 266f03eccd dir: move doc to dir.h 13c4d7eb22 diff: move doc to diff.h and diffcore.h cd5522271f rebase -r: let `label` generate safer labels 867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()` 8c15904462 built-in add -i: implement the `help` command 3d965c7674 built-in add -i: use color in the main loop 68db1cbf8e built-in add -i: support `?` (prompt help) 76b743234c built-in add -i: show unique prefixes of the commands 6348bfba58 built-in add -i: implement the main loop a376e37b2c gitweb: escape URLs generated by href() b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI f28bceca75 t/gitweb-lib.sh: drop confusing quotes 0eba60c9b7 t9502: pass along all arguments in xss helper 932757b0cc INSTALL: use existing shell scripts as example b018719927 t7004: check existence of correct tag 1daaebcaa5 built-in add -i: color the header in the `status` command 5e82b9e4d2 built-in add -i: implement the `status` command e4cb659ebd diff: export diffstat interface f83dff60a7 Start to implement a built-in version of `git add --interactive` df53c80822 stash: make sure we have a valid index before writing it ad7a403268 send-pack: check remote ref status on pack-objects failure d91ce887c9 t6120-describe: correct test repo history graph in comment 1f9247a3bd completion: tab-complete "git svn --recursive" 603960b50e promisor-remote: remove fetch_if_missing=0 e362fadcd0 clone: remove fetch_if_missing=0 169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL 51bd6be32d mingw: use COPY_ARRAY for copying array 4bd0593e0f test-tool: use 'read-graph' helper e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway d784d978f6 t4215: use helper function to check output 61eea521fe fsmonitor: do not compare bitmap size with size of split index b19f3fe9dd hex: drop sha1_to_hex() c1ce9c06d0 completion: learn to complete `git rebase --onto=` f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase aa6d7f93ed hex: drop sha1_to_hex_r() 52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch 5772b0c745 sequencer: reencode old merge-commit message e0eba649e8 bundle-verify: add --quiet 79862b6b77 bundle-create: progress output control 73c3253d75 bundle: framework for options before bundle file 68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in" b375744274 sequencer: reencode squashing commit's message 019a9d8362 sequencer: reencode revert/cherry-pick's todo list 0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding 1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary d9f6f3b619 The first batch post 2.24 cycle 28014c1084 Merge branch 'bc/hash-independent-tests-part-6' 57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree' c22f63c40f Merge branch 'pb/pretty-email-without-domain-part' 5731ca3657 Merge branch 'hw/remove-api-docs-placeholder' 14b58c62bc Merge branch 'sg/commit-graph-usage-fix' eff313f8a7 Merge branch 'dl/apply-3way-diff3' db806d7064 Merge branch 'sg/dir-trie-fixes' f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix' 8f1119b988 Merge branch 'wb/midx-progress' d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes' 0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges' 8f40d89783 Merge branch 'hv/bitshift-constants-in-blame' d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head' 5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer' b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc' 15d9f3dc66 Merge branch 'es/walken-tutorial' 026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor' ed28358833 convert: use skip_iprefix() in validate_encoding() 89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding() 03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules ae821ffe83 multimail: fix a few simple spelling errors 557c5895c2 sha1dc: fix trivial comment spelling error aa74be316a Fix spelling errors in test commands 96c0caf5e3 Fix spelling errors in messages shown to users 4dc8b1c114 Fix spelling errors in names of tests 7a40cf1553 Fix spelling errors in comments of testcases 15beaaa3d1 Fix spelling errors in code comments a807200f67 userdiff: add Elixir to supported userdiff languages 461caf3e8a git-shortlog.txt: include commit limiting options 6462d5eb9a fetch: remove fetch_if_missing=0 46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion 99b2ba35f5 t0028: eliminate non-standard usage of printf add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` 14c4776d75 t: fix typo in test descriptions 270de6acbe t6024: modernize style 77363a51fb name-hash.c: remove duplicate word in comment c92faa4d22 hashmap: fix documentation misuses of -> versus . a6d39f2efb git-filter-branch.txt: correct argument name typo 4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators 8915297925 Fix spelling errors in documentation outside of Documentation/ 031fd4b93b Documentation: fix a bunch of typos, both old and new dd0b61f577 fsmonitor: fix watchman integration 5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare() 7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph c14e6e7903 fetch: add the command-line option `--write-commit-graph` da72936f54 Git 2.24 1d34d425d4 Merge branch 'bc/doc-use-docbook-5' dac1d83c91 Merge branch 'ds/commit-graph-on-fetch' c32ca691c2 Merge branch 'jt/delay-fetch-if-missing' ab6b50e4c8 Merge https://github.com/prati0100/git-gui 93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2 fe28ad8520 rebase: add --reset-author-date 08187b4cba rebase -i: support --ignore-date 0185c683c9 sequencer: rename amend_author to author_to_rename cbd8db17ac rebase -i: support --committer-date-is-author-date c068bcc59b sequencer: allow callers of read_author_script() to ignore fields ba51d2fb24 rebase -i: add --ignore-whitespace flag 3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower 3ada78de3f myfirstcontrib: add dependency installation step 4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt 4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly 8dfb04ae96 update-index: optionally leave skip-worktree entries alone 116d1fa6c6 vreportf(): avoid relying on stdio buffering efd5444238 RelNotes/2.24.0: fix self-contradictory note 391c7e40b5 fetch.c: fix typo in a warning message 55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template 849e43680d RelNotes/2.24.0: typofix 0115e5d929 git-diff.txt: document return code of `--no-index` 798d66e35d l10n: de.po: Update German translation c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u) f21f8f5d35 Git 2.24-rc2 8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix' 0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix' f2db52c46b Merge branch 'js/mingw-needs-hiding-fix' 5b7594abdc Merge branch 'master' of github.com:vnwildman/git 034d33653a Merge branch 'next' of github.com:ChrisADR/git-po 26b061007c submodule: teach set-url subcommand 460782b7be t7519-status-fsmonitor: improve comments d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses 4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config 1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694) f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0 762d5b4f46 help: add gitsubmodules to the list of guides 76a53d640f git_path(): handle `.lock` files correctly 3ce47211a6 t1400: wrap setup code in test case 44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string 6c02042139 clone: rename static function `dir_exists()`. 8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command 77200e9332 l10n: es: 2.24.0 round 2 e42df36b42 Merge branch 'l10n/it/update-italian-translation' 5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2 51728480fe l10n: fr v2.24.0 rnd2 045a548698 l10n: git.pot: v2.24.0 round 2 (1 new) 468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree() c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit() 103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag() f648ee7088 fsck: rename vague "oid" local variables cc579000bf fsck: don't require an object struct in verify_headers() 7854399366 fsck: don't require an object struct for fsck_ident() b8b00f1693 fsck: drop blob struct from fsck_finish() 6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob() 38370253fd fsck: don't require an object struct for report() f59793763d fsck: only require an oid for skiplist functions 5afc4b1dc6 fsck: only provide oid/type in fsck_error callback 82ef89b318 fsck: don't require object structs for display functions 733902905d fsck: use oids rather than objects for object_name API d40bbc109b fsck_describe_object(): build on our get_object_name() primitive a59cfb3230 fsck: unify object-name code 23a173a761 fsck: require an actual buffer for non-blobs 2175a0c601 fsck: stop checking tag->tagged ec65231571 fsck: stop checking commit->parent counts 1de6007d85 fsck: stop checking commit->tree value 228c78fbd4 commit, tag: don't set parsed bit for parse failures 60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()` 8b656572ca builtin/commit-graph.c: remove subcommand-less usage string fa26d5ede6 t4048: abstract away SHA-1-specific constants cf02be8486 t4045: make hash-size independent 38ee26b2a3 t4044: update test to work with SHA-256 37ab8ebef1 t4039: abstract away SHA-1-specific constants 0370b35414 t4038: abstract away SHA-1 specific constants 0253e126a2 t4034: abstract away SHA-1-specific constants 45e2ef2b1d t4027: make hash-size independent 79b0edc1a0 t4015: abstract away SHA-1-specific constants 840624ff55 t4011: abstract away SHA-1-specific constants 32a6707267 t4010: abstract away SHA-1-specific constants 440bf91dfa t3429: remove SHA1 annotation 0b408ca2bd t1305: avoid comparing extensions 2eabd38313 rev-parse: add a --show-object-format option 52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode 45e206f0d8 t4203: use test-lib.sh definitions 2ae4944aac t6006: use test-lib.sh definitions cb99a34e23 commit-graph: fix writing first commit-graph during fetch e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug 7b4fb434b4 documentation: remove empty doc files 566a1439f6 Git 2.24-rc1 04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix' 4d6fb2beeb Merge branch 'ds/feature-macros' 5f0b6ed907 Merge branch 'js/azure-ci-osx-fix' c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs' 1b4f85285f Merge branch 'dl/submodule-set-branch' c7aadccba0 fetch: delay fetch_if_missing=0 until after config c11e9966cb repo-settings: read an int for index.version 091489d068 apply: respect merge.conflictStyle in --3way aa76ae4905 t4108: demonstrate bug in apply 95806205cd t4108: use `test_config` instead of `git config` b0069684d4 t4108: remove git command upstream of pipe fa87b81385 t4108: replace create_file with test_write_lines 7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job 6c96630cb0 config: move documentation to config.h d81542e6f3 Eleventh batch e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix' d45d771978 Merge branch 'bc/smart-http-atomic-push' 22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix' 2e215b7959 Merge branch 'sb/userdiff-dts' e3cf08361a Merge branch 'sg/progress-fix' b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix' c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc' f45f88b2e4 path.c: don't call the match function without value in trie_find() c72fc40d09 path.c: clarify two field names in 'struct common_dir' 8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file 7cb8c929d7 path.c: clarify trie_find()'s in-code comment e536b1fedf Documentation: mention more worktree-specific exceptions 680cba2c2b multi-pack-index: add [--[no-]progress] option. 64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file 8dc18f8937 midx: add progress to expire_midx_packs 840cef0c70 midx: add progress to write_midx_file efbc3aee08 midx: add MIDX_PROGRESS flag 0eb3671ed9 ci(osx): use new location of the `perforce` cask da1e295e00 t604[236]: do not run setup in separate tests 49b8133a9e merge-recursive: fix merging a subdirectory into the root directory d3eebaad5e merge-recursive: clean up get_renamed_dir_portion() 80736d7c5e doc: am --show-current-patch gives an entire e-mail message a8e2c0eadc t7419: change test_must_fail to ! for grep 19c29e538e t4014: make output-directory tests self-contained 12a4aeaad8 Merge branch 'js/azure-pipelines-msvc' 399c23c046 ci(visual-studio): actually run the tests in parallel 711cd6d15c ci(visual-studio): use strict compile flags, and optimization 370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0 cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master 907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master 13bcea8c7f l10n: fr 2.24.0 rnd 1 135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master 3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) 8da56a4848 userdiff: fix some corner cases in dts regex 86795774bb builtin/blame.c: constants into bit shift format feebd2d256 rebase: hide --preserve-merges option 0e40a73a4c Doc: Bundle file usage 78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error 12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error 2b6f6ea1bd test-progress: fix test failures on big-endian systems f757409e36 l10n: bg.po: Updated Bulgarian translation (4693) 176f5adfdb completion: clarify installation instruction for zsh d966095db0 Git 2.24-rc0 90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array' 3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth' d0258d0944 Merge branch 'rs/http-push-simplify' bb52def6da Merge branch 'jj/stash-reset-only-toplevel' f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs' e5fca6b573 Merge branch 'bb/compat-util-comment-fix' 43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup' 07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely' 2d74d28ee0 Merge branch 'dl/compat-cleanup' 9b83a94829 Merge branch 'ta/t1308-typofix' 376012c919 Merge branch 'js/doc-stash-save' 10da030ab7 grep: avoid leak of chartables in PCRE2 513f2b0bbd grep: make PCRE2 aware of custom allocator 57d4660468 grep: make PCRE1 aware of custom allocator d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand 8af69cf3e2 t3301: test diagnose messages for too few/many paramters 6f1194246a remote-curl: pass on atomic capability to remote side bbb13e8188 graph: fix coloring of octopus dashes 92beecc136 graph: flatten edges that fuse with their right neighbor 479db18bc0 graph: smooth appearance of collapsing edges on commit lines 0195285b95 graph: rename `new_mapping` to `old_mapping` d62893ecc1 graph: commit and post-merge lines for left-skewed merges 0f0f389f12 graph: tidy up display of left-skewed merges 458152cce1 graph: example of graph output that can be simplified ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state 46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()` a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()` 9157a2a032 graph: reuse `find_new_column_by_commit()` 210179a20d graph: handle line padding in `graph_next_line()` fbccf255f9 graph: automatically track display width of graph lines 5374a290aa fetch-pack: write fetched refs to .promisor 4627bc777e sequencer: run post-commit hook 49697cb721 move run_commit_hook() to libgit and use it there 12bb7a540a sequencer.h fix placement of #endif 6a619ca03c t3404: remove uneeded calls to set_fake_editor b2dbacbddf t3404: set $EDITOR in subshell 88a92b6c73 t3404: remove unnecessary subshell bf8e65b30b format-patch: teach --cover-from-description option a92331df18 format-patch: use enum variables 46273df7bf format-patch: replace erroneous and condition 3b3c79f6c9 diff-highlight: fix a whitespace nit 108b97dc37 Ninth batch cbe8cdd3a0 Merge branch 'jk/coc' 3b9ec27919 Merge branch 'js/trace2-fetch-push' c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch' 1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup' eb3de5b823 Merge branch 'js/xdiffi-comment-updates' 4e8371ec26 Merge branch 'dl/t0000-skip-test-test' b6d712fa4e Merge branch 'tg/range-diff-output-update' 77458870a5 Merge branch 'gs/sq-quote-buf-pretty' 5efabc7ed9 Merge branch 'ew/hashmap' d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files' 6ed610b968 Merge branch 'am/t0028-utf16-tests' 5b900fb812 Merge branch 'dl/octopus-graph-bug' 16d9d7184b Merge branch 'en/fast-imexport-nested-tags' 6d5291be45 Merge branch 'js/azure-pipelines-msvc' ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd' d96e31e390 Merge branch 'js/fetch-jobs' 280bd44551 Merge branch 'en/merge-recursive-cleanup' 062a309d36 remote-curl: use argv_array in parse_push() a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes 5cc6a4be11 http-push: simplify deleting a list item 556895d0c8 stash: avoid recursive hard reset on submodules b524f6b399 Merge branch 'ka/japanese-translation' f6f3824b4e git-gui: improve Japanese translation 61f4b407d3 Merge branch 'py/readme' 1e6880fd06 git-gui: add a readme edefc31873 format-patch: create leading components of output directory 68b69211b2 git-compat-util: fix documentation syntax fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth() e0479fa073 documentation: add tutorial for object walking 3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed 4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target 9cad1c4488 pthread.h: manually align parameter lists 8c1cfd58e3 t1308-config-set: fix a test that has a typo 57d8f4b4c7 doc(stash): clarify the description of `save` 08da6496b6 Eighth batch 07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup' f0d407e6ae Merge branch 'kt/add-i-progress' 66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree' a4c5d9f66e Merge branch 'rs/dedup-includes' 159cdabd87 Merge branch 'js/range-diff-noprefix' 93424f1f7d Merge branch 'cb/pcre1-cleanup' a73f91774c Merge branch 'ab/pcre-jit-fixes' 4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword' 020011f2cb Merge branch 'tk/git-svn-trim-author-name' 676278f8ea Merge branch 'bc/object-id-part17' aafb75452b Merge branch 'en/clean-nested-with-ignored' 3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails 5cdf2301d4 add a Code of Conduct document 70bf0b755a Seventh batch 9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat' 2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary' d17f54947d Merge branch 'rs/convert-fix-utf-without-dash' 82c80f98e6 Merge branch 'py/git-gui-has-maintainer' 6e12570822 Merge branch 'ah/cleanups' 772cad0afb Merge branch 'js/diff-rename-force-stable-sort' 424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path' 678a9ca629 Merge branch 'as/shallow-slab-use-fix' 0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix' 042a54d251 Merge branch 'am/visual-studio-config-fix' 03d3b1297c xdiffi: fix typos and touch up comments b05b40930e t0000: cover GIT_SKIP_TESTS blindspots d8bc1a518a send-pack: never fetch when checking exclusions 756fb0dedb t4014: treat rev-list output as the expected value 2b6a9b13ca range-diff: don't segfault with mode-only changes 360c7ba330 transport: push codepath can take arbitrary repository ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments b657047719 merge-recursive: fix the fix to the diff3 common ancestor label b744c3af07 Sixth batch 417056578a Merge branch 'bw/submodule-helper-usage-fix' 9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check' 1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a' 59b19bcd9f Merge branch 'cc/multi-promisor' 1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' 5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort' eb35c18e42 Merge branch 'sg/travis-help-debug' cabb145fe3 Merge branch 'rs/alias-use-copy-array' 56c7ab0f4e Merge branch 'sg/t-helper-gitignore' e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang' 583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules' 337e3f2b49 Merge branch 'rs/nth-switch-code-simplification' 8f53fe1733 Merge branch 'hb/hg-to-git-py3' ef93bfbd45 Merge branch 'sg/progress-fix' 980351d1ac Merge branch 'js/doc-patch-text' 80693e3f09 Merge branch 'tb/commit-graph-harden' ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge' 3f84633563 Merge branch 'dl/cocci-everywhere' caf150ce7d Merge branch 'gs/commit-graph-progress' 1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim' 1398171378 Merge branch 'rs/commit-graph-use-list-count' 773521df26 Merge branch 'rs/nth-parent-parse' 7f17913161 Merge branch 'dl/submodule-set-branch' cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix' bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees' 098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack' 37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc' e392382f95 Merge branch 'dl/complete-rebase-and-archive' cda8faa37e Merge branch 'jk/commit-graph-cleanup' 36d2fca82b Merge branch 'ss/get-time-cleanup' ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude' ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob' ba2d451122 Merge branch 'tg/stash-refresh-index' e2b5038d87 hashmap_entry: remove first member requirement from docs 404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry 23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators c8e424c9c9 hashmap: introduce hashmap_free_entries 8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry * 87571c3f71 hashmap: use *_entry APIs for iteration 939af16eac hashmap_cmp_fn takes hashmap_entry params f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *" f0e63c4113 hashmap: use *_entry APIs to wrap container_of 6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *" 973d5eea74 introduce container_of macro 26b455f21e hashmap_put takes "struct hashmap_entry *" 28ee794128 hashmap_remove takes "const struct hashmap_entry *" b6c5241606 hashmap_get takes "const struct hashmap_entry *" b94e5c1df6 hashmap_add takes "struct hashmap_entry *" f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *" d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *" d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry 12878c8351 coccicheck: detect hashmap_entry.hash assignment e010a41216 diff: use hashmap_entry_init on moved_entry.ent f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo" de5abb5f7a git-p4: auto-delete named temporary file c90b652afd Fifth batch f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1' b0f8aed48f Merge branch 'ma/user-manual-markup-update' faf5576a8d Merge branch 'bc/doc-use-docbook-5' 314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes' 70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo' 847650798b Merge branch 'am/mailmap-andrey-mazo' 1a155f2e66 Merge branch 'jc/git-gui-has-maintainer' 1bcef51204 t/oid-info: add empty tree and empty blob values ecde49bb8a t/oid-info: allow looking up hash algorithm name 11a3d3aadd git-rev-list.txt: prune options in synopsis 7d2f003ee4 Documentation: update the location of the git-gui repo b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding() 46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines b35304bf95 ci: really use shallow clones on Azure Pipelines ab7d854aba tests: let --immediate and --write-junit-xml play well together be5d88e112 test-tool run-command: learn to run (parts of) the testsuite 5d65ad17a9 vcxproj: include more generated files 030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built 61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable() e4347c9434 msvc: handle DEVELOPER=1 ed712ef8d5 msvc: ignore some libraries when linking 5b8f9e2417 compat/win32/path-utils.h: add #include guards 41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning c097b95a26 msvc: avoid using minus operator on unsigned types dfd557c978 stash apply: report status correctly even in a worktree's subdirectory d54dea77db fetch: let --jobs=<n> parallelize --multiple, too 87db61a436 trace2: write discard message to sentinel files 83e57b04e6 trace2: discard new traces if target directory has too many files 11c21f22de t4214: demonstrate octopus graph coloring failure 25eb905e14 t4214: explicitly list tags in log 63be8c8dd7 t4214: generate expect in their own test cases a7a5590c6e t4214: use test_merge 94ba151300 test-lib: let test_merge() perform octopus merges 22541013d0 docs: clarify trace2 version invariants 3d4548e7e2 docs: mention trace2 target-dir mode in git-config 2fe44394c8 treewide: remove duplicate #include directives dbcd970c27 push: do not pretend to return `int` from `die_push_simple()` 941790d7de fast-export: handle nested tags 8d7d33c1ce t9350: add tests for tags of things other than a commit a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags 208d69246e fast-export: add support for --import-marks-if-exists b8f50e5b60 fast-import: add support for new 'alias' command f73b2aba05 fast-import: allow tags to be identified by mark labels 3164e6bd24 fast-import: fix handling of deleted tags 8085050ab4 add -i: show progress counter in the prompt 69fdb922ad Merge branch 'bw/diff3-conflict-style' b436825b9b git-gui: support for diff3 conflict style 937b76ed49 range-diff: internally force `diff.noprefix=true` 411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job 25e4b8099c push: add trace2 instrumentation 5fc31180d8 fetch: add trace2 instrumentation 53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value c3b57dc2a0 git-gui: use existing interface to query a path's attribute 45ab460d4a Merge branch 'js/git-bash-if-available' 0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command 71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only) 54a80a9ad8 wrapper: use a loop instead of repetitive statements baed6bbb5b diffcore-break: use a goto instead of a redundant if statement 8da02ce62a commit-graph: remove a duplicate assignment ddb3c856f3 shallow.c: don't free unallocated slabs 8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits 65904b8b2b promisor-remote: skip move_to_tail when no-op 2049b8dc65 diffcore_rename(): use a stable sort 97fff61012 Move git_sort(), a stable sort, into into libgit.a 69f272b922 dir: special case check for the possibility that pathspec is NULL 6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available bc12974a89 Fourth batch 5a5350940b Merge branch 'ds/commit-graph-on-fetch' 974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch' 9755f70fe6 Merge branch 'ds/include-exclude' 93fc8760e7 Merge branch 'jh/trace2-pretty-output' 640f9cd599 Merge branch 'dl/rebase-i-keep-base' 026428c35e Merge branch 'sg/clean-nested-repo-with-ignored' 21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip' d693345518 Merge branch 'dl/use-sq-from-test-lib' d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes' 2be6ccc01a Merge branch 'sg/git-test-boolean' cf861cd7a0 Merge branch 'rs/get-tagged-oid' 91243b019d Merge branch 'en/filter-branch-deprecation' 9bc67b6658 Merge branch 'en/merge-options-ff-and-friends' fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden' cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option' 8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return' 3ff6af7753 Merge branch 'nd/switch-and-restore' aadac067aa Merge branch 'tb/file-url-to-unc-path' b57a88a5f1 Merge branch 'js/gitdir-at-unc-root' 6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path' 430439536b Merge branch 'rs/parse-tree-indirect' 991fd97b9a Merge branch 'jk/fast-import-history-bugfix' 74a39b9bcc Merge branch 'mh/notes-duplicate-entries' 37801f0665 Merge branch 'tb/banned-vsprintf-namefix' 21ce0b48f3 Merge branch 'mh/release-commit-memory-fix' f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup' bf6136cab8 Merge branch 'rs/strbuf-detach' a2e22bb3ad Merge branch 'rs/trace2-dst-warning' 1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup' 0281733483 Merge branch 'bc/hash-independent-tests-part-5' f06fb376ed Merge branch 'jc/test-cleanup' 00bb74453d Merge branch 'dl/compat-cleanup' 59438be06c Merge branch 'js/visual-studio' cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone' af2abd870b fast-export: fix exporting a tag and nothing else c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit fd5b820d9c user-manual.txt: change header notation e79b34533a user-manual.txt: add missing section label b503a2d515 Makefile: emulate compile in $(HCO) target better af26e2a9d2 pack-bitmap.h: remove magic number b06fdead04 promisor-remote.h: include missing header 97b989ee3a apply.h: include missing header 4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name d928a8388a t0028: add more tests 0b63fd6965 t0028: fix test for UTF-16-LE-BOM fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration 2e09c01232 name-rev: avoid cutoff timestamp underflow 8464f94aeb promisor-remote.h: drop extern from function declaration 75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp 24c681794f doc: MyFirstContribution: fix cmd placement instructions c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode 60c60b627e Merge branch 'py/git-git-extra-stuff' faf420e05a treewide: correct several "up-to-date" to "up to date" b71c6c3b64 Fix build with core.autocrlf=true 16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff 26e3d1cbea .mailmap: update email address of Andrey Mazo 27ea41c0b4 t/helper: ignore only executable files 7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias() 83e3ad3b12 merge-recursive: symlink's descendants not in way 34933d0eff stash: make sure to write refreshed cache e080b34540 merge: use refresh_and_write_cache 22184497a3 factor out refresh_and_write_cache function 7371612255 commit-graph: add --[no-]progress to write and verify 47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW 253bfe49bd SubmittingPatches: git-gui has a new maintainer d17ae00c97 hg-to-git: make it compatible with both python3 and python2 4c86140027 Third batch f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http' 627b826834 Merge branch 'md/list-objects-filter-combo' b9ac6c59b8 Merge branch 'cc/multi-promisor' de67293e74 Merge branch 'sg/line-log-tree-diff-optim' 95486229e3 Merge branch 'sg/complete-configuration-variables' f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook' a2e524ecf3 Merge branch 'cb/curl-use-xmalloc' 128666753b Merge branch 'jk/drop-release-pack-memory' 917a319ea5 Merge branch 'js/rebase-r-strategy' 7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui 4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout() 0d4304c124 doc: fix reference to --ignore-submodules af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py 8a3a6817e2 Merge gitk to pick up emergency build fix 2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po 9027af58e2 Makefile: run coccicheck on more source files 43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES) 5dedf7de53 Makefile: define THIRD_PARTY_SOURCES 902b90cf42 clean: fix theoretical path corruption ca8b5390db clean: rewrap overly long line 09487f2cba clean: avoid removing untracked files in a nested git repository e86bbcf987 clean: disambiguate the definition of -d 3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run 29b577b960 dir: add commentary explaining match_pathspec_item's return value 89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case 404ebceda0 dir: also check directories for matching pathspecs a5e916c745 dir: fix off-by-one error in match_pathspec_item bbbb6b0b89 dir: fix typo in comment 7541cc5302 t7300: add testcases showing failure to clean specified pathspecs 0eb7c37a8a diff, log doc: small grammer, format, and language fixes 6fae6bd518 diff, log doc: say "patch text" instead of "patches" 2bb74b53a4 Test the progress display bbf47568ad Revert "progress: use term_clear_line()" cf6a2d2557 Makefile: strip leading ./ in $(LIB_H) b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup 689a146c91 commit-graph: use commit_list_count() 59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N" a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N" a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base" cf34337f98 list-objects-filter: give a more specific error sparse parsing error 4c96a77594 list-objects-filter: delay parsing of sparse oid 72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter 83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer 7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>` 226daba280 Doc/Makefile: give mansource/-version/-manual attributes 40e747e89d git-submodule.txt: fix AsciiDoc formatting error f6461b82b9 Documentation: fix build with Asciidoctor 2 3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk f7a8834ba4 Merge branch 'bp/amend-toggle-bind' ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit" 9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog beffae768a gitk: Add Chinese (zh_CN) translation 56d9cbe68b packfile: expose get_delta_base() bab28d9f97 builtin/pack-objects: report reused packfile objects 6c8ec8c30a Merge branch 'bw/commit-scrollbuffer' acfa495519 Merge branch 'bw/amend-checkbutton' da08d559b7 git-gui: add horizontal scrollbar to commit buffer ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton aeeb978ba6 completion: teach archive to use __gitcomp_builtin 2b9bd488ae completion: teach rebase to use __gitcomp_builtin d49dffde9a completion: add missing completions for log, diff, show 6abada1880 upload-pack: disable commit graph more gently for shallow traversal fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time 72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set 4fd39c76e6 doc: minor formatting fix 29f4332e66 Quit passing 'now' to date code c77abf0460 Merge branch 'py/revert-hunks-lines' 5a2bb62180 Merge branch 'bp/widget-focus-hotkeys' e07446ed5f git-gui: add hotkeys to set widget focus f981ec18cf cache-tree: do not lazy-fetch tentative tree f1d4a28250 Second batch c8ada15456 Merge branch 'bc/reread-attributes-during-rebase' 8f3ba423e7 Merge branch 'tg/t0021-racefix' a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email' d49c2c3466 Merge branch 'sb/userdiff-dts' 2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe' 4c49dd042d Merge branch 'nd/diff-parseopt' d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix' 8ce8a63b46 Merge branch 'ds/midx-expire-repack' 9437394661 Merge branch 'cb/fetch-set-upstream' af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix' fa9e7934c7 Merge branch 'bm/repository-layout-typofix' d1a251a1fa Merge branch 'en/checkout-mismerge-fix' e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental' f4f8dfe127 Merge branch 'ds/feature-macros' 4a12f89865 Merge branch 'jk/eoo' b4a1eec332 Merge branch 'jk/repo-init-cleanup' 70336bd50a Merge branch 'py/git-gui-do-quit' ad7c543e3b grep: skip UTF8 checks explicitly 0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration() b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration 4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor b7e1ba5649 git-merge-index.txt: wrap shell listing in "----" 38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----" 5371813768 git-ls-remote.txt: wrap shell listing in "----" 1925fe0c8a Documentation: wrap config listings in "----" 922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor 2017956a19 Documentation: wrap blocks with "--" dd2e50a84e commit-graph: turn off save_commit_buffer 67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits 806278dead commit-graph.c: handle corrupt/missing trees 16749b8dd2 commit-graph.c: handle commit parsing errors 23424ea759 t/t5318: introduce failing 'git commit-graph write' tests bf1e28e0ad builtin/rebase.c: Remove pointless message d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing bd482d6e33 t: use common $SQ variable 3a37876b5d pack-objects: drop packlist index_pos optimization 7e6b96c73b test-read-cache: drop namelen variable e4b369069e diff-delta: set size out-parameter to 0 for NULL delta 7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint f1cbd033e2 pack-objects: use object_id in packlist_alloc() 0dfed92dfd git-am: handle missing "author" when parsing commit 3960290675 ci: restore running httpd tests 6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests c77722b3ea use get_tagged_oid() dad3f0607b tag: factor out get_tagged_oid() 468ce99b77 unpack-trees: rename 'is_excluded_from_list()' 65edd96aec treewide: rename 'exclude' methods to 'pattern' 4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_' caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list' ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern' 483e861111 t9902: use a non-deprecated command for testing 9df53c5de6 Recommend git-filter-repo instead of git-filter-branch 7b6ad97939 t6006: simplify, fix, and optimize empty message test 50094ca45f config/format.txt: specify default value of format.coverLetter c1a6f21cd4 Doc: add more detail for git-format-patch 854b5cb46a t4014: stop losing return codes of git commands dd2b6b6860 t4014: remove confusing pipe in check_threading() 6bd26f58ea t4014: use test_line_count() where possible c6ec6dadba t4014: let sed open its own files f2e2fa8f60 t4014: drop redirections to /dev/null 460609cbd5 t4014: use indentable here-docs 92014b69bb t4014: remove spaces after redirect operators 0ab74e979c t4014: use sq for test case names cb46c40662 t4014: move closing sq onto its own line b562a54c01 t4014: s/expected/expect/ e770fbfeff t3005: remove unused variable da280f5f1a t: use LF variable defined in the test harness 7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch 552fc5016f mingw: apply array.cocci rule 476998d05b t3427: accelerate this test by using fast-export and fast-import aac6ff7b5b .gitignore: stop ignoring `.manifest` files 2c65d90f75 am: reload .gitattributes after patching it 1577dc0f7c tree: simplify parse_tree_indirect() 50f26bd035 fetch: add fetch.writeCommitGraph config setting 8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set 27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options 0a8bc7068f clarify documentation for remote helpers 80e3658647 help: make help_unknown_ref() NORETURN 313677627a checkout: add simple check for 'git checkout -b' 3441de5b9c gitk: Make web links clickable a4fa2f0a4c git-gui: allow undoing last revert 414d924beb rebase: teach rebase --keep-base 6330209d7d rebase tests: test linear branch topology 4effc5bc96 rebase: fast-forward --fork-point in more cases c0efb4c1dd rebase: fast-forward --onto in more cases 2b318aa6c3 rebase: refactor can_fast_forward into goto tower c9efc21683 t3432: test for --no-ff's interaction with fast-forward 1ebec8dfc1 fast-import: duplicate into history rather than passing ownership 9756082b3c fast-import: duplicate parsed encoding string 86ae43da6a status: mention --skip for revert and cherry-pick b1b16bba96 completion: add --skip for cherry-pick and revert deaa65a754 completion: merge options for cherry-pick and revert 4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests 793ac7e309 t3432: test rebase fast-forward behavior 359ecebc34 t3431: add rebase --fork-point tests 502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage ff61681b46 grep: refactor and simplify PCRE1 support 8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1 1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning() fd99c2dd9b grep: use return value of strbuf_detach() 82f51af345 log-tree: always use return value of strbuf_detach() 7e92756751 http: don't leak urlmatch_config.vars 9784f97321 commit: free the right buffer in release_commit_memory ce17feb1b3 path: add a function to check for path suffix 60d198d022 banned.h: fix vsprintf()'s ban message 60fe477a0b notes: avoid potential use-after-free during insertion 779ad6641b notes: avoid leaking duplicate entries 4e1a641ee3 mingw: fix launching of externals from Unicode paths 5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly e2683d51d9 Fix .git/ discovery at the root of UNC shares d17f2124a7 setup_git_directory(): handle UNC paths correctly ebb8d2c90f mingw: support UNC in git clone file://server/share/repo 0c37c41d13 t4009: make hash size independent c1f3dfcc23 t4002: make hash independent 8cc5ff83c3 t4000: make hash size independent c784815073 t3903: abstract away SHA-1-specific constants 2ccdfb1c78 git-gui: return early when patch fails to apply 62bd99934b git-gui: allow reverting selected hunk 5f0a516de9 git-gui: allow reverting selected lines fddf2ebe38 transport: teach all vtables to allow fetch first ac3fda82bf transport-helper: skip ls-refs if unnecessary 745f681289 First batch after Git 2.23 d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg' 22e86e85cb Merge branch 'en/fast-import-merge-doc' 9c7573581c Merge branch 'jk/perf-no-dups' 4336fdb2ef Merge branch 'rs/nedalloc-fixlets' 8ae7a46c4d Merge branch 'sg/show-failed-test-names' 6ba06b582b Merge branch 'sg/commit-graph-validate' 072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix' 207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix' 77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests' 1b01cdbf2e Merge branch 'jk/tree-walk-overflow' 8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix' 307179732d Merge branch 'mt/grep-submodules-working-tree' 58166c2e9d t0021: make sure clean filter runs 8b3f33ef11 ref-filter: initialize empty name or email fields 3c81760bc6 userdiff: add a builtin pattern for dts files fe49814409 t4014: drop unnecessary blank lines from test cases a2bb801f6a line-log: avoid unnecessary full tree diffs eef5204190 line-log: extract pathspec parsing from line ranges into a helper function a63694f523 diff: skip GITLINK when lazy fetching missing objs 7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe 19800bdc3f parseopt: move definition of enum parse_opt_result up 415b770b88 packfile.h: drop extern from function declaration acb49d1cc8 t3800: make hash-size independent ca6ba94200 t3600: make hash size independent 19ce5496c2 t3506: make hash independent 9a6738c061 t3430: avoid hard-coded object IDs 4dd1b5f90f t3404: abstract away SHA-1-specific constants b99bfc7a6c t3306: abstract away SHA-1-specific constants e3e9d02e35 t3305: make hash size independent b408cf8cf6 t3301: abstract away SHA-1-specific constants b561edd213 t3206: abstract away hash size constants a5f61c7d13 t3201: abstract away SHA-1-specific constants 1c24a54ea4 repository-layout.txt: correct pluralization of 'object' b0a3186140 sequencer: simplify root commit creation a47ba3c777 rebase -i: check for updated todo after squash and reword 450efe2d53 rebase -i: always update HEAD before rewording c581e4a749 grep: under --debug, show whether PCRE JIT is enabled aaa95dfa05 midx: switch to using the_hash_algo be8e172e9f builtin/show-index: replace sha1_to_hex 3f34d70d40 rerere: replace sha1_to_hex fc06be3b7f builtin/receive-pack: replace sha1_to_hex 69fa337060 builtin/index-pack: replace sha1_to_hex 3a4d7aa5ae packfile: replace sha1_to_hex e0cb7cdb89 wt-status: convert struct wt_status to object_id 8d4d86b0f0 cache: remove null_sha1 f6ca67d673 builtin/worktree: switch null_sha1 to null_oid dd336a5511 builtin/repack: write object IDs of the proper length 894c0f66bb pack-write: use hash_to_hex when writing checksums 4439c7a360 sequencer: convert to use the_hash_algo 95518faac1 bisect: switch to using the_hash_algo e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo fe9fec45f6 config: use the_hash_algo in abbrev comparison 976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo 703d2d4193 bundle: switch to use the_hash_algo 9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo 7962e046ff show-index: switch hard-coded constants to the_hash_algo fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ 7e0d029f18 builtin/rev-parse: switch to use the_hash_algo 319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo f6af19a9ad fetch-pack: use parse_oid_hex 36261e42ec patch-id: convert to use the_hash_algo 28ba1830d0 builtin/replace: make hash size independent 24bc1a1292 pull, fetch: add --set-upstream option 71d41ff651 archive-tar: turn length miscalculation warning into BUG 17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header() 82a46af13e archive-tar: fix pax extended header length calculation 4060c1990a archive-tar: report wrong pax extended header length 4615a8cb5b merge-recursive: alphabetize include list 45ef16f77a merge-recursive: add sanity checks for relevant merge_options f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* 5bf7e5779e merge-recursive: split internal fields into a separate struct e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output a779fb829b merge-recursive: comment and reorder the merge_options fields 8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options 7c0a6c8e47 merge-recursive: move some definitions around to clean up the header c749ab1da8 merge-recursive: rename merge_options argument to opt in header bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list 4d7101e25c merge-recursive: fix some overly long lines 724dd767b2 cache-tree: share code between functions writing an index as a tree 345480d1ed merge-recursive: don't force external callers to do our logging b4db8a2b76 merge-recursive: remove useless parameter in merge_trees() 98a1d3d888 merge-recursive: exit early if index != head 9822175d2b Ensure index matches head before invoking merge machinery, round N 10f751c06b merge-recursive: remove another implicit dependency on the_repository f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks 8e01251694 merge-recursive: introduce an enum for detect_directory_renames values 743474cbfa merge-recursive: provide a better label for diff3 common ancestor 51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u) 5bace62582 l10n: Update Catalan translation 139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees() 65c01c6442 checkout: provide better conflict hunk description with detached HEAD d8523ca1b9 merge-recursive: be consistent with assert acb7da05ac checkout: remove duplicate code 93b980e58f http: use xmalloc with cURL 64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental aaf633c2ad repo-settings: create feature.experimental setting c6cc4c5afd repo-settings: create feature.manyFiles setting ad0fb65999 repo-settings: parse core.untrackedCache 31b1de6a09 commit-graph: turn on commit-graph by default b068d9a250 t6501: use 'git gc' in quiet mode 7211b9e753 repo-settings: consolidate some config settings 507e5470a0 worktree remove: clarify error message on dirty worktree 5af9d5f6c8 completion: complete config variables and values for 'git clone --config=' 88cd790d6a completion: complete config variables names and values for 'git clone -c' dd33472831 completion: complete values of configuration variables after 'git -c var=' e1e00089da completion: complete configuration sections and variable names for 'git -c' 42d0efec59 completion: split _git_config() d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp() 2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names d9438873c4 completion: deduplicate configuration sections 7a09a8f093 completion: add tests for 'git config' completion 840d7e5b3c completion: complete more values of more 'color.*' configuration variables 08a12175d8 completion: fix a typo in a comment 9827d4c185 packfile: drop release_pack_memory() d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed 362f8b280c t/perf: rename duplicate-numbered test script 742ed63345 trace2: cleanup whitespace in perf format e34430556c trace2: cleanup whitespace in normal format c2b890aca5 quote: add sq_append_quote_argv_pretty() ad43e37839 trace2: trim trailing whitespace in normal format error message 04f10d332f trace2: remove dead code in maybe_add_string_va() da4589ce7e trace2: trim whitespace in region messages in perf target format 0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit 5440eb0ea2 git-gui: call do_quit before destroying the main window bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook 6098817fd7 git-merge: honor pre-merge-commit hook a1f3dd7eb3 merge: do no-verify like commit f78f6c7e0c t7503: verify proper hook execution 70597e8386 nedmalloc: avoid compiler warning about unused value c9b9c09dae nedmalloc: do assignments only after the declaration section 22932d9169 config: stop checking whether the_repository is NULL 5732f2b1ef common-main: delay trace2 initialization 58ebccb478 t1309: use short branch name in includeIf.onbranch test 67feca3b1c gitcli: document --end-of-options 51b4594b40 parse-options: allow --end-of-options as a synonym for "--" 19e8789b23 revision: allow --end-of-options to end option parsing ffe1afe67c tests: show the test name and number at the start of verbose output 96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests 7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits' 39d8831856 commit-graph: turn a group of write-related macro flags into an enum 9916073be5 t5318-commit-graph: use 'test_expect_code' 620c09e1b6 restore: add test for deleted ita files ecd72042de checkout.c: unstage empty deleted ita files a613d4f817 pack-refs: always refresh after taking the lock file decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd' 371df1bea9 trace2: cleanup column alignment in perf target format 5aa02f9868 tree-walk: harden make_traverse_path() length computations c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path() b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len() 37806080d7 tree-walk: use size_t consistently 7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh' 12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh' 9055384710 tree-walk: drop oid from traverse_info 947208b725 setup_traverse_info(): stop copying oid e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` a63f990d92 t3418: test `rebase -r` with merge strategies 5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges` e145d99347 rebase -r: support merge strategies other than `recursive` 4e6023b13a t3427: fix another incorrect assumption f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced a9c71073da t3427: fix erroneous assumption b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case c248d32cdb t3427: simplify the `setup` test case significantly 8c1e24048a t3427: add a clarifying comment 5efed0ecf9 rebase: fold git-rebase--common into the -p backend 68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone 2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive` 6180b20239 t3400: stop referring to the scripted rebase d5b581f228 Drop unused git-rebase--am.sh 814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation 6a289d45c0 grep: fix worktree case in submodules 870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching 8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data 09872f6418 grep: create a "is_fixed" member in "grep_pat" 8a35b540a9 grep: consistently use "p->fixed" in compile_regexp() 685668faaa grep: stop using a custom JIT stack with PCRE v1 34489239d0 grep: stop "using" a custom JIT stack with PCRE v2 04bef50c01 grep: remove overly paranoid BUG(...) code b65abcafc7 grep: use PCRE v2 for optimized fixed-string search 48de2a768c grep: remove the kwset optimization 45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern> 25754125ce grep: make the behavior for NUL-byte in patterns sane d316af059d grep tests: move binary pattern tests into their own file 471dac5d2c grep tests: move "grep binary" alongside the rest f463beb805 grep: inline the return value of a function call used only once b14cf112e2 t4210: skip more command-line encoding tests on MinGW 44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>" 4e2443b181 log tests: test regex backends in "--encode=<enc>" tests 90d21f9ebf list-objects-filter-options: make parser void 5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW 489fc9ee71 list-objects-filter-options: allow mult. --filter c2694952e3 strbuf: give URL-encoding API a char predicate fn cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list f56f764279 list-objects-filter-options: move error check up e987df5fe6 list-objects-filter: implement composite filters 842b00516a list-objects-filter-options: always supply *errbuf 7a7c7f4a6d list-objects-filter: put omits set in filter struct 9430147ca0 list-objects-filter: encapsulate filter components 4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c 60b7a92d84 Move repository_format_partial_clone to promisor-remote.c db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} 75de085211 remote: add promisor and partial clone config to the doc 7e154badc0 partial-clone: add multiple remotes in the doc 9a4c507886 t0410: test fetching from many promisor remotes 5e46139376 builtin/fetch: remove unique promisor remote limitation fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote() faf2abf496 promisor-remote: use repository_format_partial_clone 9cfebc1f3b promisor-remote: add promisor_remote_reinit() 9e27beaa23 promisor-remote: implement promisor_remote_get_direct() 48de315817 Add initial support for many promisor remotes 2e860675b6 fetch-object: make functions return an error code c59c7c879e t0410: remove pipes after git commands git-subtree-dir: third_party/git git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
#: builtin/stash.c:22 builtin/stash.c:37
#, fuzzy
msgid "git stash list [<options>]"
msgstr "git worktree list [<opcions>]"
#: builtin/stash.c:23 builtin/stash.c:42
#, fuzzy
msgid "git stash show [<options>] [<stash>]"
msgstr "git remote show [<opcions>] <nom>"
#: builtin/stash.c:24 builtin/stash.c:47
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr ""
#: builtin/stash.c:25
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr ""
#: builtin/stash.c:26 builtin/stash.c:62
#, fuzzy
msgid "git stash branch <branchname> [<stash>]"
msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
#: builtin/stash.c:27 builtin/stash.c:67
msgid "git stash clear"
msgstr ""
#: builtin/stash.c:28 builtin/stash.c:77
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--] [<pathspec>...]]"
msgstr ""
#: builtin/stash.c:31 builtin/stash.c:84
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
#: builtin/stash.c:52
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#: builtin/stash.c:57
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#: builtin/stash.c:72
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr ""
#: builtin/stash.c:127
#, fuzzy, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
#: builtin/stash.c:147
#, fuzzy, c-format
msgid "Too many revisions specified:%s"
msgstr "S'han especificat massa revisions: $REV"
#: builtin/stash.c:161 git-legacy-stash.sh:548
msgid "No stash entries found."
msgstr "No s'ha trobat cap «stash»."
#: builtin/stash.c:175
#, fuzzy, c-format
msgid "%s is not a valid reference"
msgstr "«%s» no és un nom de remot vàlid"
#: builtin/stash.c:224 git-legacy-stash.sh:75
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear amb paràmetres no està implementat"
#: builtin/stash.c:403
#, fuzzy
msgid "cannot apply a stash in the middle of a merge"
msgstr "No es pot aplicar un magatzem enmig d'una fusió"
#: builtin/stash.c:414
#, fuzzy, c-format
msgid "could not generate diff %s^!."
msgstr "no s'ha pogut generar la llista per a fer"
#: builtin/stash.c:421
#, fuzzy
msgid "conflicts in index.Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
#: builtin/stash.c:427
#, fuzzy
msgid "could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
#: builtin/stash.c:434
#, fuzzy
msgid "could not restore untracked files from stash"
msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»"
#: builtin/stash.c:448
#, fuzzy, c-format
msgid "Merging %s with %s"
msgstr "S'està fusionant %s amb %s\n"
#: builtin/stash.c:458 git-legacy-stash.sh:680
msgid "Index was not unstashed."
msgstr "L'índex no estava sense emmagatzemar."
#: builtin/stash.c:516 builtin/stash.c:615
#, fuzzy
msgid "attempt to recreate the index"
msgstr "S'ha produït un error en llegir l'índex"
#: builtin/stash.c:549
#, fuzzy, c-format
msgid "Dropped %s (%s)"
msgstr "${REV} ($s) descartada"
#: builtin/stash.c:552
#, fuzzy, c-format
msgid "%s: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
#: builtin/stash.c:577
#, fuzzy, c-format
msgid "'%s' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
#: builtin/stash.c:627 git-legacy-stash.sh:694
msgid "The stash entry is kept in case you need it again."
msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
#: builtin/stash.c:650 git-legacy-stash.sh:712
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
#: builtin/stash.c:790 builtin/stash.c:827
#, fuzzy, c-format
msgid "Cannot update %s with %s"
msgstr "No es pot actualitzar $ref_stash amb $w_commit"
#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
#, fuzzy
msgid "stash message"
msgstr "missatge d'etiqueta"
#: builtin/stash.c:818
#, fuzzy
msgid "\"git stash store\" requires one <commit> argument"
msgstr "--bisect-clean-state no accepta paràmetres"
#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "No hi ha canvis seleccionats"
#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "Encara no teniu la comissió inicial"
#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "No es pot desar l'estat d'índex actual"
#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "No es poden desar els fitxers no seguits"
#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "No es pot desar l'estat d'arbre de treball actual"
#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "No es pot registrar l'estat de l'arbre de treball"
#: builtin/stash.c:1269 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "No es poden usar --patch i --include-untracked o --all a la vegada."
#: builtin/stash.c:1285
#, fuzzy
msgid "Did you forget to 'git add'?"
msgstr "Potser volíeu dir «git add .»?\n"
#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "No hi ha canvis locals a desar"
#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "No es pot inicialitzar el magatzem"
#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "No es pot desar l'estat actual"
#: builtin/stash.c:1327
#, fuzzy, c-format
msgid "Saved working directory and index state %s"
msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
#: builtin/stash.c:1452 builtin/stash.c:1488
#, fuzzy
msgid "keep index"
msgstr "Actualitza l'índex"
#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr ""
#: builtin/stash.c:1455 builtin/stash.c:1491
#, fuzzy
msgid "quiet mode"
msgstr "silenciós"
#: builtin/stash.c:1457 builtin/stash.c:1493
#, fuzzy
msgid "include untracked files in stash"
msgstr "mostra els fitxers no seguits en columnes"
#: builtin/stash.c:1459 builtin/stash.c:1495
#, fuzzy
msgid "include ignore files"
msgstr "elimina només els fitxers ignorats"
#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr "no s'ha pogut executar %s"
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
#: builtin/stripspace.c:19
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
"omet i elimina totes les línies que comencin amb el caràcter de comentari"
#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "anteposa el caràcter de comentari i un espai a cada línia"
#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "S'espera un nom de referència ple, s'ha rebut %s"
#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "no es pot despullar un component de l'url «%s»"
#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr "S'està entrant a «%s»\n"
#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"submodules of %s\n"
"."
msgstr ""
#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Omet la sortida en entrar l'ordre de cada submòdul"
#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Inclou recursivament els submòduls imbrincats"
#: builtin/submodule--helper.c:570
#, fuzzy
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [<ordre>]"
#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és "
"el seu dipòsit font autoritzat."
#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»"
#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"advertència: se suggereix el mode d'actualització per ordre per al submòdul "
"«%s»\n"
#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"S'ha produït un error en registrar el mode d'actualització per al camí de "
"submòdul «%s»"
#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Omet la sortida d'inicialitzar un submòdul"
#: builtin/submodule--helper.c:713
#, fuzzy
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<camí>]"
#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»"
#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»"
#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Suprimeix la sortida de l'estat del submòdul"
#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "inclou recursivament els submòduls imbrincats"
#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]"
#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n"
#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
"s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»"
#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Omet la sortida de la sincronització de l'url del submòdul"
#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
"L'arbre de treball de submòdul «%s» conté un directori .git\n"
"(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)"
#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
"L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' "
"per a descartar-les"
#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "S'ha netejat el directori «%s»\n"
#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul «%s»\n"
#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "no s'ha pogut crear el directori de submòdul buit %s"
#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "S'ha desregistrat el submòdul «%s» (%s) per al camí «%s»\n"
#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Suprimeix els arbres de treball dels submòduls fins i tot si contenen canvis "
"locals"
#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Desregistra recursivament tots els submòduls"
#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]"
#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls"
#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy"
#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation"
#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "a on es clonarà el submòdul nou"
#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "url del qual clonar el submòdul"
#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "força el progrés del clonatge"
#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat"
#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»"
#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»"
#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Mode d'actualització «%s» configurat no vàlid per al camí de submòdul «%s»"
#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "El camí de submòdul «%s» no està inicialitzat"
#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Potser voleu usar 'update --init'?"
#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "S'està ometent el submòdul no fusionat %s"
#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "S'està ometent el submòdul «%s»"
#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent"
#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant"
#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "camí a l'arbre de treball"
#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats"
#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "tasques paral·leles"
#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat"
#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "no imprimeixis el progrés del clonatge"
#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "valor incorrecte per al paràmetre update"
#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
"La branca de submòdul (%s) està configurada per a heretar la branca del "
"superprojecte, però el superprojecte no és en cap branca"
#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "no s'ha pogut obtenir el gestor del dipòsit pel submòdul «%s»"
#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "inclou recursivament als submòduls"
#: builtin/submodule--helper.c:2100
#, fuzzy
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper embed-git-dir [<camí>...]"
#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr "comprova si és segur escriure al fitxer .gitmodules"
#: builtin/submodule--helper.c:2159
#, fuzzy
msgid "unset the config in the .gitmodules file"
msgstr "l'allistament del .gitmodules actualitzat ha fallat"
#: builtin/submodule--helper.c:2164
#, fuzzy
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config name [valor]"
#: builtin/submodule--helper.c:2165
#, fuzzy
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config name [valor]"
#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, fuzzy, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
"per a procedir"
#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no admet --super-prefix"
#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "«%s» no és un subordre vàlid de submodule--helper"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <nom>"
#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "omet el missatge d'error de referències no simbòliques (separades)"
#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "suprimeix la referència simbòlica"
#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "escurça la sortida de referències"
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason"
msgstr "raó"
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason of the update"
msgstr "raó de l'actualització"
#: builtin/tag.c:25
#, fuzzy
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
"\t\t<tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-"
"d'etiqueta> [<cap>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nom-d'etiqueta>..."
#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] "
"[--points-at <objecte>]\n"
"\t\t[--format=<format>] [--[no-]merged [<comissió>]] [<patró>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "no s'ha trobat l'etiqueta «%s»."
#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "S'ha suprimit l'etiqueta «%s» (era %s)\n"
#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
"Write a message for tag:\n"
" %s\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
"\n"
"Escriviu el missatge de l'etiqueta:\n"
" %s\n"
"Les línies que comencin amb «%c» s'ignoraran.\n"
#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
"Write a message for tag:\n"
" %s\n"
"Lines starting with '%c' will be kept; you may remove them yourself if you "
"want to.\n"
msgstr ""
"\n"
"Escriviu el missatge de l'etiqueta:\n"
" %s\n"
"Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós "
"mateix si voleu.\n"
#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "no s'ha pogut signar l'etiqueta"
#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"already a tag. If you meant to tag the object that it points to, use:\n"
"\n"
"\tgit tag -f %s %s^{}"
msgstr ""
#: builtin/tag.c:232
msgid "bad object type."
msgstr "el tipus d'objecte és incorrecte."
#: builtin/tag.c:284
msgid "no tag message?"
msgstr "no hi ha cap missatge d'etiqueta?"
#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "S'ha deixat el missatge de l'etiqueta en %s\n"
#: builtin/tag.c:402
msgid "list tag names"
msgstr "llista els noms d'etiqueta"
#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
#: builtin/tag.c:406
msgid "delete tags"
msgstr "suprimeix les etiquetes"
#: builtin/tag.c:407
msgid "verify tags"
msgstr "verifica les etiquetes"
#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Opcions de creació d'etiquetes"
#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "etiqueta anotada, necessita un missatge"
#: builtin/tag.c:413
msgid "tag message"
msgstr "missatge d'etiqueta"
#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "força l'edició del missatge de l'etiqueta"
#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada i signada per GPG"
#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "usa una altra clau per a signar l'etiqueta"
#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "reemplaça l'etiqueta si existeix"
#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "crea un registre de referències"
#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Opcions de llistat d'etiquetes"
#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "mostra la llista d'etiquetes en columnes"
#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "imprimeix només les etiquetes que continguin la comissió"
#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "imprimeix només les etiquetes que no continguin la comissió"
#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "imprimeix només les etiquetes que s'han fusionat"
#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "imprimeix només les etiquetes que no s'han fusionat"
#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "imprimeix només les etiquetes de l'objecte"
#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column i -n són incompatibles"
#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "es permet l'opció -n només amb mode llista"
#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "es permet l'opció --contains només amb mode llista"
#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "es permet l'opció --no-contains només amb mode llista"
#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "es permet --points-at option només amb mode llista"
#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "es permeten les opcions --merged i --no-merged només amb mode llista"
#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "només es permet una opció -F o -m."
#: builtin/tag.c:542
msgid "too many params"
msgstr "massa paràmetres"
#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» no és un nom d'etiqueta vàlid."
#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "l'etiqueta «%s» ja existeix"
#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta «%s» actualitzada (era %s)\n"
#: builtin/unpack-objects.c:500
msgid "Unpacking objects"
msgstr "S'estan desempaquetant els objectes"
#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "s'ha produït un error en crear el directori %s"
#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "s'ha produït un error en crear el fitxer %s"
#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "s'ha produït un error en suprimir el fitxer %s"
#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "s'ha produït un error en suprimir el directori %s"
#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "S'està provant mtime en «%s» "
#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr ""
"la informació d'stat de directori no canvia després d'afegir un fitxer nou"
#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"la informació d'stat de directori no canvia després d'afegir un directori nou"
#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr ""
"la informació d'stat de directori canvia després d'actualitzar un fitxer"
#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"la informació d'stat de directori canvia després d'afegir un fitxer dins "
"d'un subdirectori"
#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr ""
"la informació d'stat de directori no canvia després de suprimir un fitxer"
#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"la informació d'stat de directori no canvia després de suprimir un directori"
#: builtin/update-index.c:221
msgid " OK"
msgstr " D'acord"
#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr ""
"continua l'actualització encara que l'índex necessiti una actualització"
#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "actualitza: ignora els submòduls"
#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "no ignoris els fitxers nous"
#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "tingues en compte els fitxers absents de l'arbre de treball"
#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "actualitza encara que l'índex contingui entrades no fusionades"
#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "actualitza la informació d'estadístiques"
#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<mode>,<objecte>,<camí>"
#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a \"no canviant\""
#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "neteja el bit assumed-unchanged"
#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "marca els fitxers com a \"només índex\""
#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "neteja el bit skip-worktree"
#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr ""
"només afegeix a l'índex; no afegeixis el contingut a la base de dades "
"d'objectes"
#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr ""
"elimina els camins anomenats encara que estiguin presents en l'arbre de "
"treball"
#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls"
#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard"
#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "afegeix les entrades de l'entrada estàndard a l'índex"
#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "reemplena les «stage» #2 i #3 per als camins llistats"
#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "només actualitza les entrades que difereixin de HEAD"
#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "ignora els fitxers absents de l'arbre de treball"
#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "informa de les accions en la sortida estàndard"
#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "escriu l'índex en aquest format"
#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "habilita o inhabilita l'índex dividit"
#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "habilita/inhabilita la memòria cau no seguida"
#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "prova si el sistema de fitxers admet la memòria cau no seguida"
#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers"
#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr ""
#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "habilita o inhabilita el monitor del sistema de fitxers"
#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "marca els fitxers com a vàlids pel fsmonitor"
#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "neteja el bit de validesa del fsmonitor"
#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
"voleu habilitar l'índex dividit"
#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
"voleu inhabilitar l'índex dividit"
#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
"realment voleu inhabilitar el cau no seguit"
#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "La memòria cau no seguida està inhabilitada"
#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
"realment voleu habilitar el cau no seguit"
#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "La memòria cau no seguida està habilitada per a «%s»"
#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor està establert a fals; establiu-lo a cert si realment voleu "
"habilitar fsmonitor"
#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "fsmonitor habilitat"
#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor està establert a cert; elimineu-lo si realment voleu "
"inhabilitar fsmonitor"
#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "fsmonitor inhabilitat"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<opcions>] -d <nom-de-referència> [<valor-antic>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
"git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-antic>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opcions>] --stdin [-z]"
#: builtin/update-ref.c:364
msgid "delete the reference"
msgstr "suprimeix la referència"
#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
msgstr "actualitza <nom de referència>, no la que apunti"
#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
msgstr "stdin té paràmetres acabats amb NUL"
#: builtin/update-ref.c:368
msgid "read updates from stdin"
msgstr "llegeix les actualitzacions des de stdin"
#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
msgstr "git update-server-info [--force]"
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "actualitza els fitxers d'informació des de zero"
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcions>] <directori>"
#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "surt immediatament després de l'anunci inicial de referència"
#: builtin/upload-pack.c:27
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"no intentis <directori>/.git/ si <directori> no és cap directori del Git"
#: builtin/upload-pack.c:29
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromp la transferència després de <n> segons d'inactivitat"
#: builtin/verify-commit.c:20
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <comissió>..."
#: builtin/verify-commit.c:69
msgid "print commit contents"
msgstr "imprimeix els continguts de la comissió"
#: builtin/verify-commit.c:70 builtin/verify-tag.c:38
msgid "print raw gpg status output"
msgstr "imprimeix la sortida crua de l'estat gpg"
#: builtin/verify-pack.c:55
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquet>..."
#: builtin/verify-pack.c:65
msgid "verbose"
msgstr "detallat"
#: builtin/verify-pack.c:67
msgid "show statistics only"
msgstr "mostra només estadístiques"
#: builtin/verify-tag.c:19
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..."
#: builtin/verify-tag.c:37
msgid "print tag contents"
msgstr "imprimeix els continguts de l'etiqueta"
#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opcions>] <camí> [<commit-ish>"
#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opcions>]"
#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opcions>] <camí>"
#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbre de treball> <camí-nou>"
#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opcions>]"
#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree lock [<opcions>] <arbre de treball>"
#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <camí>"
#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "s'ha produït un error en suprimir «%s»"
#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr ""
"S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven "
"%<PRIuMAX> bytes, llegits %<PRIuMAX>)"
#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
"existent"
#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "informa dels arbres de treball podats"
#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "fes caducar els arbres de treball més vells que <hora>"
#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "«%s» ja existeix"
#: builtin/worktree.c:252
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "no s'ha pogut tornar a afegir a l'arbre de treball «%s»"
#: builtin/worktree.c:257
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use 'add -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr "no s'ha pogut crear directori de «%s»"
#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "S'està preparant l'arbre de treball (branca nova «%s»)"
#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)"
#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "crea una branca nova"
#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "emplena l'arbre de treball nou"
#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "mantén l'arbre de treball nou bloquejat"
#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "configura el mode de seguiment (vegeu git-branch(1))"
#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"prova de fer coincidir el nom de la branca nova amb una branca amb seguiment "
"remot"
#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B i --detach són mútuament excloents"
#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track només es pot usar si es crea una branca nova"
#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "raó per bloquejar"
#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "«%s» no és un arbre de treball"
#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal"
#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "«%s» ja està bloquejat, raó: «%s»"
#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "«%s» ja està bloquejat"
#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» no està bloquejat"
#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
#: builtin/worktree.c:779
#, fuzzy
msgid "force move even if worktree is dirty or locked"
msgstr "força el moviment / canvi de nom encara que el destí existeixi"
#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "«%s» és un arbre de treball principal"
#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no s'ha pogut deduir el nom de destí des de «%s»"
#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "el destí «%s» ja existeix"
#: builtin/worktree.c:821
#, fuzzy, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
#: builtin/worktree.c:823
#, fuzzy
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validació ha fallat, no es pot moure l'arbre de treball: %s"
#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "s'ha produït un error en moure «%s» a «%s»"
#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "no s'ha pogut executar «git status» a «%s»"
#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "no s'ha pogut executar «git status» a «%s», codi %d"
#: builtin/worktree.c:911
#, fuzzy
msgid "force removal even if worktree is dirty or locked"
msgstr "força el moviment / canvi de nom encara que el destí existeixi"
#: builtin/worktree.c:934
#, fuzzy, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
#: builtin/worktree.c:936
#, fuzzy
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<prefix>/"
#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>"
#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "només útil per a la depuració"
#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"users may be able to read your cached credentials. Consider running:\n"
"\n"
"\tchmod 0700 %s"
msgstr ""
"Els permisos en el vostre directori de sòcol són massa liberals;\n"
"pot ser que altres usuaris poden llegir les vostres credencials.\n"
"Considereu executar:\n"
"\n"
"\tchmod 0700 %s"
#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "imprimeix els missatges de depuració a stderr"
#: t/helper/test-reach.c:152
#, c-format
msgid "commit %s is not marked reachable"
msgstr "la comissió %s no està marcada com abastable"
#: t/helper/test-reach.c:162
msgid "too many commits marked reachable"
msgstr "masses comission marcades com abastable"
#: t/helper/test-serve-v2.c:7
#, fuzzy
msgid "test-tool serve-v2 [<options>]"
msgstr "git serve [<opcions>]"
#: t/helper/test-serve-v2.c:19
#, fuzzy
msgid "exit immediately after advertising capabilities"
msgstr "surt immediatament després de l'anunci inicial de referència"
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" <command> [<args>]"
msgstr ""
#: git.c:34
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
"to read about a specific subcommand or concept.\n"
"See 'git help git' for an overview of the system."
msgstr ""
"«git help -a» i «git help -g» llisten subordres disponibles i\n"
"algunes guies de concepte. Vegeu «git help <ordre>» o\n"
"«git help <concepte>» per a llegir sobre un subordre o concepte específic.\n"
"Vegeu «git help git» per a una visió general del sistema."
#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "no s'ha especificat un directori per --git-dir\n"
#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "no s'ha especificat un nom d'espai per --namespace\n"
#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "no s'ha especificat un directori per --work-tree\n"
#: git.c:228
#, fuzzy, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "%s no admet --super-prefix"
#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c espera una cadena de configuració\n"
#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "no s'ha especificat un directori per -C\n"
#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "opció desconeguda: %s\n"
#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr ""
#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr ""
#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "àlies recursiu: %s"
#: git.c:460
msgid "write failure on standard output"
msgstr "fallada d'escriptura en la sortida estàndard"
#: git.c:462
msgid "unknown write failure on standard output"
msgstr "fallada d'escriptura desconeguda en la sortida estàndard"
#: git.c:464
msgid "close failed on standard output"
msgstr "ha fallat el tancament en la sortida estàndard"
#: git.c:796
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
#: git.c:846
#, fuzzy, c-format
msgid "cannot handle %s as a builtin"
msgstr "no es pot usar %s com a fitxer d'exclusió"
#: git.c:859
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
"ús: %s\n"
"\n"
#: git.c:879
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
#: git.c:891
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "s'ha produït un error en executar l'ordre «%s»: %s\n"
#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d"
#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "No s'admet el control de delegació amb el cURL < 7.22.0"
#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
#: http.c:876
#, fuzzy
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
#: http.c:949
#, fuzzy
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
#: http.c:1096
#, fuzzy, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "No s'ha pogut tornar a $head_name"
#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" asked for: %s\n"
" redirect: %s"
msgstr ""
"no s'ha pogut actualitzar l'URL base des de la redirecció:\n"
" petició: %s\n"
" redirecció: %s"
#: remote-curl.c:157
#, fuzzy, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "valor parcial no vàlid: «%s»"
#: remote-curl.c:254
#, fuzzy, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "«%s» no reconegut com un dipòsit git"
#: remote-curl.c:355
#, fuzzy
msgid "invalid server response; expected service, got flush packet"
msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
#: remote-curl.c:386
#, fuzzy, c-format
msgid "invalid server response; got '%s'"
msgstr "referència no vàlida: %s"
#: remote-curl.c:446
#, fuzzy, c-format
msgid "repository '%s' not found"
msgstr "no s'ha trobat la branca «%s»."
#: remote-curl.c:450
#, fuzzy, c-format
msgid "Authentication failed for '%s'"
msgstr "falta el valor per «%s»"
#: remote-curl.c:454
#, fuzzy, c-format
msgid "unable to access '%s': %s"
msgstr "no s'ha pogut accedir a '%s': %s"
#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "s'està redirigint a %s"
#: remote-curl.c:584
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
#: remote-curl.c:664
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
#: remote-curl.c:724
#, fuzzy, c-format
msgid "RPC failed; %s"
msgstr "STARTTLS ha fallat! %s"
#: remote-curl.c:764
#, fuzzy
msgid "cannot handle pushes this big"
msgstr "no es pot usar %s com a fitxer d'exclusió"
#: remote-curl.c:879
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
#: remote-curl.c:883
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
#: remote-curl.c:1014
#, fuzzy
msgid "dumb http transport does not support shallow capabilities"
msgstr "El servidor no permet clients superficials"
#: remote-curl.c:1028
#, fuzzy
msgid "fetch failed."
msgstr "l'«stash» ha fallat"
#: remote-curl.c:1076
msgid "cannot fetch by sha1 over smart http"
msgstr ""
#: remote-curl.c:1120 remote-curl.c:1126
#, fuzzy, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
"s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
#: remote-curl.c:1138 remote-curl.c:1252
#, fuzzy, c-format
msgid "http transport does not support %s"
msgstr "la variant «simple» d'ssh no és compatible amb -4"
#: remote-curl.c:1174
#, fuzzy
msgid "git-http-push failed"
msgstr "l'«stash» ha fallat"
#: remote-curl.c:1360
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
#: remote-curl.c:1392
msgid "remote-curl: error reading command stream from git"
msgstr ""
#: remote-curl.c:1399
msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
#: remote-curl.c:1439
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
#: list-objects-filter-options.h:61
msgid "args"
msgstr "args"
#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "filtratge d'objecte"
#: parse-options.h:170
msgid "expiry-date"
msgstr "data-de-caducitat"
#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
#: parse-options.h:305
msgid "be more verbose"
msgstr "sigues més detallat"
#: parse-options.h:307
msgid "be more quiet"
msgstr "sigues més callat"
#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> xifres per presentar els SHA-1"
#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr "com suprimir els espais i #comentaris del missatge"
#: ref-filter.h:101
msgid "key"
msgstr "clau"
#: ref-filter.h:101
msgid "field name to sort on"
msgstr "nom del camp en el qual ordenar"
#: rerere.h:44
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"actualitza l'índex amb la resolució de conflicte reusada si és possible"
#: wt-status.h:68
msgid "HEAD detached at "
msgstr "HEAD separat a "
#: wt-status.h:69
msgid "HEAD detached from "
msgstr "HEAD separat de "
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Afegeix els continguts dels fitxers a l'índex"
#: command-list.h:51
msgid "Apply a series of patches from a mailbox"
msgstr "Aplica una sèrie de pedaços des d'una bústia de correu"
#: command-list.h:52
msgid "Annotate file lines with commit information"
msgstr "Anota les línies del fitxer amb la informació de la comissió"
#: command-list.h:53
msgid "Apply a patch to files and/or to the index"
msgstr "Aplica un pedaç a fitxer i/o a l'índex"
#: command-list.h:54
msgid "Import a GNU Arch repository into Git"
msgstr "Importa un dipòsit GNU Arch a Git"
#: command-list.h:55
msgid "Create an archive of files from a named tree"
msgstr "Crea un arxiu de fitxers des d'un arbre amb nom"
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
msgstr "Troba per cerca binària el canvi que hagi introduït un defecte"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
msgstr ""
"Mostra quina revisió i autor ha modificat per últim cop cada línia d'un "
"fitxer"
#: command-list.h:58
msgid "List, create, or delete branches"
msgstr "Llista, crea o suprimeix branques"
#: command-list.h:59
msgid "Move objects and refs by archive"
msgstr ""
#: command-list.h:60
msgid "Provide content or type and size information for repository objects"
msgstr ""
"Proveeix contingut o informació del tipus i mida per als objectes del dipòsit"
#: command-list.h:61
msgid "Display gitattributes information"
msgstr "Mostra la informació de .gitattributes"
#: command-list.h:62
msgid "Debug gitignore / exclude files"
msgstr "Depura gitignore / fitxers d'exclusió"
#: command-list.h:63
#, fuzzy
msgid "Show canonical names and email addresses of contacts"
msgstr "Mostra l'adreça electrònica de cada autor"
#: command-list.h:64
msgid "Switch branches or restore working tree files"
msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball"
#: command-list.h:65
msgid "Copy files from the index to the working tree"
msgstr "Copia fitxers des de l'índex a l'arbre de treball"
#: command-list.h:66
msgid "Ensures that a reference name is well formed"
msgstr "Assegura que un nom de referència està ben format"
#: command-list.h:67
msgid "Find commits yet to be applied to upstream"
msgstr "Troba les comissions que encara s'han d'aplicar a la font"
#: command-list.h:68
msgid "Apply the changes introduced by some existing commits"
msgstr "Aplica els canvis introduïts per algunes comissions existents"
#: command-list.h:69
msgid "Graphical alternative to git-commit"
msgstr "Alternativa gràfica a git-commit"
#: command-list.h:70
msgid "Remove untracked files from the working tree"
msgstr "Suprimeix els fitxers no seguits de l'arbre de treball"
#: command-list.h:71
msgid "Clone a repository into a new directory"
msgstr "Clona un dipòsit a un directori nou"
#: command-list.h:72
msgid "Display data in columns"
msgstr "Mostra les dades en columnes"
#: command-list.h:73
msgid "Record changes to the repository"
msgstr "Registra els canvis al dipòsit"
#: command-list.h:74
msgid "Write and verify Git commit-graph files"
msgstr "Escriu i verifica els fitxers commit-graph de Git"
#: command-list.h:75
msgid "Create a new commit object"
msgstr "Crea un objecte de comissió nou"
#: command-list.h:76
msgid "Get and set repository or global options"
msgstr "Obté o estableix opcions de dipòsit o globals"
#: command-list.h:77
msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
#: command-list.h:78
msgid "Retrieve and store user credentials"
msgstr ""
#: command-list.h:79
msgid "Helper to temporarily store passwords in memory"
msgstr ""
#: command-list.h:80
msgid "Helper to store credentials on disk"
msgstr "Ajudant per a emmagatzemar credencials a disc"
#: command-list.h:81
msgid "Export a single commit to a CVS checkout"
msgstr ""
#: command-list.h:82
msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
#: command-list.h:83
msgid "A CVS server emulator for Git"
msgstr "Un emulador de servidor CVS per al Git"
#: command-list.h:84
msgid "A really simple server for Git repositories"
msgstr "Un servidor realment senzill per a dipòsits Git"
#: command-list.h:85
msgid "Give an object a human readable name based on an available ref"
msgstr "Dóna un nom llegible per humans basant-se en les referències disponibles"
#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc."
#: command-list.h:87
msgid "Compares files in the working tree and the index"
msgstr "Compara fitxers en l'arbre de treball i l'índex"
#: command-list.h:88
msgid "Compare a tree to the working tree or index"
msgstr "Compara un arbre amb l'arbre de treball o l'índex"
#: command-list.h:89
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
#: command-list.h:90
msgid "Show changes using common diff tools"
msgstr "Mostra els canvis usant eines diff comunes"
#: command-list.h:91
msgid "Git data exporter"
msgstr "Explorador de dades del Git"
#: command-list.h:92
msgid "Backend for fast Git data importers"
msgstr "Rerefons per a importadors ràpids de dades de Git"
#: command-list.h:93
msgid "Download objects and refs from another repository"
msgstr "Baixa objectes i referències d'un altre dipòsit"
#: command-list.h:94
msgid "Receive missing objects from another repository"
msgstr "Rep els objectes que manquen des d'un altre dipòsit"
#: command-list.h:95
msgid "Rewrite branches"
msgstr "Torna a escriure les branques"
#: command-list.h:96
msgid "Produce a merge commit message"
msgstr "Produeix un missatge de comissió de fusió"
#: command-list.h:97
msgid "Output information on each ref"
msgstr "Mostra la informació en cada referència"
#: command-list.h:98
msgid "Prepare patches for e-mail submission"
msgstr "Prepara pedaços per enviar-los per correu electrònic"
#: command-list.h:99
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "Verifica la connectivitat i validesa del objectes a la base de dades"
#: command-list.h:100
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "Neteja els fitxers innecessaris i optimitza el dipòsit local"
#: command-list.h:101
msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
#: command-list.h:102
msgid "Print lines matching a pattern"
msgstr "Imprimeix les línies coincidents amb un patró"
#: command-list.h:103
msgid "A portable graphical interface to Git"
msgstr "Una interfície gràfic portable per al Git"
#: command-list.h:104
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "Calcula l'ID de l'objecte i opcionalment crea un blob des del fitxer"
#: command-list.h:105
msgid "Display help information about Git"
msgstr "Mostra informació d'ajuda del Git"
#: command-list.h:106
msgid "Server side implementation of Git over HTTP"
msgstr ""
#: command-list.h:107
msgid "Download from a remote Git repository via HTTP"
msgstr "Baixa des d'un dipòsit Git remot via HTTP"
#: command-list.h:108
#, fuzzy
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Baixa objectes i referències d'un altre dipòsit"
#: command-list.h:109
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
#: command-list.h:110
msgid "Build pack index file for an existing packed archive"
msgstr ""
#: command-list.h:111
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Crea un dipòsit de Git buit o reinicialitza un existent"
#: command-list.h:112
msgid "Instantly browse your working repository in gitweb"
msgstr ""
#: command-list.h:113
msgid "Add or parse structured information in commit messages"
msgstr ""
#: command-list.h:114
msgid "The Git repository browser"
msgstr "El navegador de dipòsits Git"
#: command-list.h:115
msgid "Show commit logs"
msgstr "Mostra els registres de comissió"
#: command-list.h:116
msgid "Show information about files in the index and the working tree"
msgstr "Mostra informació sobre els fitxer a l'índex i a l'arbre de treball"
#: command-list.h:117
msgid "List references in a remote repository"
msgstr "Mostra les referències d'un dipòsit remot"
#: command-list.h:118
msgid "List the contents of a tree object"
msgstr "Mostra els continguts d'un objecte de l'arbre"
#: command-list.h:119
msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
#: command-list.h:120
msgid "Simple UNIX mbox splitter program"
msgstr ""
#: command-list.h:121
msgid "Join two or more development histories together"
msgstr "Uneix dues o més històries de desenvolupament"
#: command-list.h:122
#, fuzzy
msgid "Find as good common ancestors as possible for a merge"
msgstr "troba els avantpassats per a una sola fusió d'n vies"
#: command-list.h:123
#, fuzzy
msgid "Run a three-way file merge"
msgstr "S'està retrocedint a una fusió de 3 vies...\n"
#: command-list.h:124
#, fuzzy
msgid "Run a merge for files needing merging"
msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers"
#: command-list.h:125
msgid "The standard helper program to use with git-merge-index"
msgstr ""
#: command-list.h:126
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "Executa eines de resolució de conflictes per a resoldre conflictes de fussió"
#: command-list.h:127
msgid "Show three-way merge without touching index"
msgstr ""
#: command-list.h:128
msgid "Write and verify multi-pack-indexes"
msgstr ""
#: command-list.h:129
msgid "Creates a tag object"
msgstr "Crea un objecte etiqueta"
#: command-list.h:130
msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
#: command-list.h:131
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Mou o canvia de nom a un fitxer, directori o enllaç simbòlic"
#: command-list.h:132
msgid "Find symbolic names for given revs"
msgstr ""
#: command-list.h:133
msgid "Add or inspect object notes"
msgstr "Afegeix o inspecciona notes de l'objecte"
#: command-list.h:134
msgid "Import from and submit to Perforce repositories"
msgstr "Importa des de i envia a dipòsits Perforce"
#: command-list.h:135
msgid "Create a packed archive of objects"
msgstr "Crea un arxiu empaquetat d'objectes"
#: command-list.h:136
msgid "Find redundant pack files"
msgstr "Troba fitxers empaquetats redundants"
#: command-list.h:137
msgid "Pack heads and tags for efficient repository access"
msgstr ""
#: command-list.h:138
msgid "Routines to help parsing remote repository access parameters"
msgstr ""
#: command-list.h:139
msgid "Compute unique ID for a patch"
msgstr "Calcula un identificador única per a cada pedaç"
#: command-list.h:140
msgid "Prune all unreachable objects from the object database"
msgstr "Poda tots els objectes no accessibles de la base de dades d'objectes"
#: command-list.h:141
msgid "Remove extra objects that are already in pack files"
msgstr ""
#: command-list.h:142
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Obtén i integra amb un altre dipòsit o una branca local"
#: command-list.h:143
msgid "Update remote refs along with associated objects"
msgstr ""
"Actualitza les referències remotes juntament amb els objectes associats"
#: command-list.h:144
#, fuzzy
msgid "Applies a quilt patchset onto the current branch"
msgstr "No hi ha cap font per defecte definida per a la branca actual."
#: command-list.h:145
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
#: command-list.h:146
#, fuzzy
msgid "Reads tree information into the index"
msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
#: command-list.h:147
msgid "Reapply commits on top of another base tip"
msgstr "Torna a aplicar les comissions sobre un altre punt de basament"
#: command-list.h:148
#, fuzzy
msgid "Receive what is pushed into the repository"
msgstr "Registra els canvis al dipòsit"
#: command-list.h:149
#, fuzzy
msgid "Manage reflog information"
msgstr "mostra la informació de resolució de desfet"
#: command-list.h:150
#, fuzzy
msgid "Manage set of tracked repositories"
msgstr "Registra els canvis al dipòsit"
#: command-list.h:151
#, fuzzy
msgid "Pack unpacked objects in a repository"
msgstr "--cached fora d'un dipòsit"
#: command-list.h:152
#, fuzzy
msgid "Create, list, delete refs to replace objects"
msgstr ""
"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
#: command-list.h:153
msgid "Generates a summary of pending changes"
msgstr ""
#: command-list.h:154
msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
#: command-list.h:155
msgid "Reset current HEAD to the specified state"
msgstr "Restableix la HEAD actual a l'estat especificat"
#: command-list.h:156
msgid "Restore working tree files"
msgstr "Restaura els fitxers de l'arbre de treball"
#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Reverteix comissions existents"
#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Mostra les comissions en ordre topològic invers"
#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Escolleix i personalitza els paràmetres"
#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Elimina fitxers de l'arbre de treball i de l'índex"
#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Envia una col·leció de pedaços com a correus electrònics"
#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Puja objectes sobre el protocol Git a un altre dipòsit"
#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:165
msgid "Show various types of objects"
msgstr "Mostra diversos tipus d'objectes"
#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Mostra les branques i les seves comissions"
#: command-list.h:167
msgid "Show packed archive index"
msgstr "Mostra l'índex d'arxius empaquetat"
#: command-list.h:168
msgid "List references in a local repository"
msgstr "Llista les referències en un dipòsit local"
#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Codi de scripts de configuració comuns pel Git shell"
#: command-list.h:171
#, fuzzy
msgid "Stash the changes in a dirty working directory away"
msgstr "%s: ja existeix en el directori de treball"
#: command-list.h:172
#, fuzzy
msgid "Add file contents to the staging area"
msgstr "Afegeix els continguts dels fitxers a l'índex"
#: command-list.h:173
msgid "Show the working tree status"
msgstr "Mostra l'estat de l'arbre de treball"
#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Suprimeix l'espai en blanc innecessari"
#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Inicialitza, actualitza o inspecciona submòduls"
#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Operació bidireccional entre un dipòsit a Subversion i Git"
#: command-list.h:177
msgid "Switch branches"
msgstr "Commuta branques"
#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Llegeix, modifica i suprimeix referències simbòliques"
#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Crea un fitxer temporal amb els continguts dels blobs"
#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Desempaqueta objectes d'un arxiu empaquetat"
#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Registra els continguts del fitxer en l'arbre de treball a l'índex"
#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr ""
"Actualitza el nom de l'objecte emmagatzema en una referència de forma segura"
#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Envia l'arxiu de tornada al git-archive"
#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Envia els objectes empaquetats de tornada al git-fetch-pack"
#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Mostra una variable lògica del Git"
#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Verifica la signatura GPG de les comissions"
#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Valida els fitxers d'arxius Git empaquetats"
#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Verifica la signatura GPG de les etiquetes"
#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Interfície web del Git (interfície web pels dipòsits Git)"
#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Mostra registres amb la diferència introduïda per cada comissió"
#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Gestiona múltiples arbres de treball"
#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Crea un objecte arbre des de l'índex actual"
#: command-list.h:195
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Interfície i convencions de la línia d'ordres del Git"
#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Un tutorial bàsic del Git per a desenvolupadors"
#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git per a usuaris del CVS"
#: command-list.h:199
#, fuzzy
msgid "Tweaking diff output"
msgstr "omet la sortida de diferències"
#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un conjunt mínim útil d'ordres diàries del Git"
#: command-list.h:201
msgid "A Git Glossary"
msgstr "Un glossari de Git"
#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Lligams utilitzats pel Git"
#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
#: command-list.h:204
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
#: command-list.h:205
msgid "Git namespaces"
msgstr "Espais de noms del Git"
#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Disposició del dipòsit del Git"
#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial d'introducció al Git: segona part"
#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Un tutorial d'introducció al Git"
#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Cal començar per \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Voleu que ho faci per vostè [Y/n]? "
#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Introducció de revisió errònia: $arg"
#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Entrada de revisió errònia: $bisected_head"
#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Introducció de revisió errònia: $rev"
#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' pot acceptar només un paràmetre."
#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Cap fitxer de registre donat"
#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "no es pot llegir $file per a reproducció"
#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? de què parleu?"
#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr ""
#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "s'està executant $command"
#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
"el pas de bisecció ha fallat:\n"
"el codi de sortida $res de '$command' és < 0 o >= 128"
#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "el pas de bisecció no pot continuar més"
#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
"el pas de bisecció ha fallat:\n"
"'bisect_state $state' ha sortit amb el codi d'error $res"
#: git-bisect.sh:292
msgid "bisect run success"
msgstr "pas de bisecció reeixit"
#: git-bisect.sh:300
msgid "We are not bisecting."
msgstr "No estem bisecant."
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per "
"fusionar"
#: git-merge-octopus.sh:61
msgid "Automated merge did not work."
msgstr "La fusió automàtica no ha funcionat."
#: git-merge-octopus.sh:62
msgid "Should not be doing an octopus."
msgstr "No s'ha de fer un pop."
#: git-merge-octopus.sh:73
#, sh-format
msgid "Unable to find common commit with $pretty_name"
msgstr "No s'ha pogut trobar cap comissió en comú amb $pretty_name"
#: git-merge-octopus.sh:77
#, sh-format
msgid "Already up to date with $pretty_name"
msgstr "Ja està al dia amb $pretty_name"
#: git-merge-octopus.sh:89
#, sh-format
msgid "Fast-forwarding to: $pretty_name"
msgstr "S'està avançant ràpidament a: $pretty_name"
#: git-merge-octopus.sh:97
#, sh-format
msgid "Trying simple merge with $pretty_name"
msgstr "S'està intentant una fusió simple amb $pretty_name"
#: git-merge-octopus.sh:102
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "No es pot actualitzar $ref_stash amb $w_commit"
#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr ""
#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "S'han especificat massa revisions: $REV"
#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "No es pot aplicar un magatzem enmig d'una fusió"
#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»"
#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "No es pot fer «unstage» dels fitxers modificats"
#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
"treball"
#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../"
#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ja existeix en l'índex"
#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' ja existeix en l'índex i no és submòdul"
#: git-submodule.sh:239
#, fuzzy, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "el camí «%s» no té la seva versió"
#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Use -f if you really want to add it."
msgstr ""
"El camí següent s'ignora per un dels vostres fitxers .gitignore:\n"
"$sm_path\n"
"Useu -f si realment voleu afegir-lo."
#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'índex"
#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid"
#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Es troba un directori de git per a '$sm_name' localment amb els remots:"
#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" $realrepo\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
"Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n"
" $realrepo\n"
"useu l'opció '--force'. Si el directori de git local no és el dipòsit "
"correcte\n"
"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--"
"name'."
#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
"S'està reactivant el directori de git local per al submòdul '$sm_name'."
#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "No s'ha pogut agafar el submòdul '$sm_path'"
#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "S'ha produït un error en afegir el submòdul '$sm_path'"
#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "S'ha produït un error en registrar el submòdul '$sm_path'"
#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'"
#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
"camí de submòdul '$sm_path'"
#: git-submodule.sh:606
#, fuzzy, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. "
"L'obtenció directa d'aquella comissió ha fallat."
#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'"
#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'"
#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'"
#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'"
#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"L'execució de '$command $sha1' ha fallat en el camí de submòdul "
"'$displaypath'"
#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"S'ha produït un error en recorre recursivament dins del camí de submòdul "
"'$displaypath'"
#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "L'opció --cached no es pot usar amb l'opció --files"
#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Avís: $display_name no conté la comissió $sha1_src"
#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Avís: $display_name no conté la comissió $sha1_dst"
#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
#: git-parse-remote.sh:89
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr "Vegeu git-${cmd}(1) per detalls."
#: git-rebase--preserve-merges.sh:109
#, fuzzy
msgid "Applied autostash."
msgstr "S'ha aplicat el magatzem automàtic."
#: git-rebase--preserve-merges.sh:112
#, fuzzy, sh-format
msgid "Cannot store $stash_sha1"
msgstr "No es pot emmagatzemar $stash_sha1"
#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "S'està fent «rebase» ($new_count/$total)"
#: git-rebase--preserve-merges.sh:207
#, fuzzy
msgid ""
"\n"
"Commands:\n"
"p, pick <commit> = use commit\n"
"r, reword <commit> = use commit, but edit the commit message\n"
"e, edit <commit> = use commit, but stop for amending\n"
"s, squash <commit> = use commit, but meld into previous commit\n"
"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
"x, exec <commit> = run command (the rest of the line) using shell\n"
"d, drop <commit> = remove commit\n"
"l, label <label> = label current HEAD with a name\n"
"t, reset <label> = reset HEAD to a label\n"
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". create a merge commit using the original merge commit's\n"
". message (or the oneline, if no original merge commit was\n"
". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"Ordres:\n"
" p, pick = usa la comissió\n"
" r, reword = usa la comissió, però edita el missatge de comissió\n"
" e, edit = usa la comissió, però atura't per a esmenar\n"
" s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n"
" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta "
"comissió\n"
" x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret "
"d'ordres\n"
" d, drop = elimina la comissió\n"
"\n"
"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit commit --amend $gpg_sign_opt_quoted\n"
"\n"
"Once you are satisfied with your changes, run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
"Podeu esmenar la comissió ara, amb\n"
"\n"
"\tgit commit --amend $gpg_sign_opt_quoted\n"
"\n"
"Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
"\n"
"\tgit rebase --continue"
#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: no és una comissió que es pugui escollir"
#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nom de comissió no vàlid: $sha1"
#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avanç ràpid a $sha1"
#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "No es pot avançar ràpidament a $sha1"
#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "No es pot moure HEAD a $first_parent"
#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "S'està refusant fer «squash» a una fusió: $sha1"
#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error en refer la fusió $sha1"
#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "No s'ha pogut escollir $sha1"
#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Aquest és el missatge de comissió núm. ${n}:"
#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "El missatge de comissió núm. ${n} s'ometrà:"
#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Això és una combinació de $count comissió."
msgstr[1] "Això és una combinació de $count comissions."
#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No es pot escriure $fixup_msg"
#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Això és una combinació de 2 comissions."
#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "No s'ha pogut aplicar $sha1... $rest"
#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"This is most likely due to an empty commit message, or the pre-commit hook\n"
"failed. If the pre-commit hook failed, you may need to resolve the issue "
"before\n"
"you are able to reword the commit."
msgstr ""
"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... "
"$rest\n"
"Això és probablement a causa d'un missatge de comissió buit, o el lligam de\n"
"precomissió ha fallat. Si el lligam de precomissió ha fallat, pot ser que\n"
"necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
"comissió."
#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "S'ha aturat a $sha1_abbrev... $rest"
#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "No es pot '$squash_style' sense una comissió prèvia"
#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "S'està executant: $rest"
#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'execució ha fallat: $rest"
#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "i ha fet canvis a l'índex o l'arbre de treball"
#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
"Podeu arreglar el problema, i llavors executeu\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"but left changes to the index and/or the working tree\n"
"Commit or stash your changes, and then run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
"L'execució ha tingut èxit: $rest\n"
"però ha deixat canvis a l'índex o l'arbre de treball\n"
"Cometeu o emmagatzemeu els vostres canvis, i llavors executeu\n"
"\n"
"\tgit rebase --continue"
#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Ordre desconeguda: $command $sha1 $rest"
#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Corregiu-ho usant «git rebase --edit-todo»."
#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"If these changes are meant to be\n"
"squashed into the previous commit, run:\n"
"\n"
" git commit --amend $gpg_sign_opt_quoted\n"
"\n"
"If they are meant to go into a new commit, run:\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
"Teniu canvis «stage» en el vostre arbre de treball.\n"
"Si aquests canvis són per fer «squash»\n"
"a la comissió prèvia, executeu:\n"
"\n"
" git commit --amend $gpg_sign_opt_quoted\n"
"\n"
"Si són per a formar una comissió nova, executeu:\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
"En ambdós casos, quan hàgiu terminat, continueu amb:\n"
"\n"
" git rebase --continue\n"
#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar "
"la comissió"
#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"Teniu canvis no comesos en el vostre arbre de treball. \n"
"Primer cometeu-los i després executeu «git rebase --continue» de nou."
#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "No s'han pogut cometre els canvis «staged»."
#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "No s'ha pogut executar l'editor"
#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No s'ha pogut agafar $switch_to"
#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "No hi ha cap HEAD?"
#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No s'ha pogut crear el $state_dir temporal"
#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "No s'ha pogut marcar com a interactiu"
#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "No s'han pogut iniciar les comissions reescrites"
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "ús: $dashless $USAGE"
#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"No es pot canviar de directori a $cdup, el nivell superior de l'arbre de "
"treball"
#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "fatal: no es pot usar $program_name sense un arbre de treball."
#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "No es poden reescriure branques: Teniu canvis «unstaged»."
#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "No es pot baixar fent «rebase»: Teniu canvis «unstaged»."
#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "No es pot $action: Teniu canvis «unstaged»."
#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre."
#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "No es pot $action: El vostre índex conté canvis sense cometre."
#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "No s'ha pogut determinar el camí absolut del directori de git"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
#: git-add--interactive.perl:211
msgid "staged"
msgstr "staged"
#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "unstaged"
#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "binari"
#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "res"
#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "sense canvis"
#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "afegit %d camí\n"
msgstr[1] "afegits %d camins\n"
#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "actualitzat %d camí\n"
msgstr[1] "actualitzats %d camins\n"
#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "revertit %d camí\n"
msgstr[1] "revertits %d camins\n"
#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "modificat %d camí\n"
msgstr[1] "modificat %d camins\n"
#: git-add--interactive.perl:641
msgid "Update"
msgstr "Actualitza"
#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Reverteix"
#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s està ara sense seguiment.\n"
#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Afegeix sense seguiment"
#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Sense fitxers no seguits.\n"
#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «staging»."
#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «stashing»."
#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «unstaging»."
#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per aplicar-se."
#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per descartar-se."
#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s"
#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n"
#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"To remove '%s' lines, make them ' ' lines (context).\n"
"To remove '%s' lines, delete them.\n"
"Lines starting with %s will be removed.\n"
msgstr ""
"---\n"
"Per suprimir «%s» línies, feu-les línies ' ' (context).\n"
"Per suprimir «%s» línies, suprimiu-les.\n"
"Les línies que comencin per %s seran suprimides.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n"
"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició "
"s'avorta\n"
"i el tros es deixa sense cap canvi.\n"
#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input
#. at this point.
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es "
"descartarà) [y/n]? "
#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"q - quit; do not stage this hunk or any of the remaining ones\n"
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
"y - fes «stage» d'aquest tros\n"
"n - no facis «stage» d'aquest tros\n"
"q - surt; no facis «stage» d'aquest tros o de cap altre restant\n"
"a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer"
#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"q - quit; do not stash this hunk or any of the remaining ones\n"
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
"y - fes «stash» d'aquest tros\n"
"n - no facis «stash» d'aquest tros\n"
"q - surt; no facis «stash» d'aquest tros o de cap altre restant\n"
"a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «stash» d'aquest tros o de cap altre restant del fitxer"
#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"q - quit; do not unstage this hunk or any of the remaining ones\n"
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
"y - fes «unstage» d'aquest tros\n"
"n - no facis «unstage» d'aquest tros\n"
"q - surt; no facis «unstage» d'aquest tros o de cap altre restant\n"
"a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer"
#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
"y - aplica aquest tros a l'índex\n"
"n - no apliquis aquest tros a l'índex\n"
"q - surt; no apliquis aquest tros ni cap dels pendents\n"
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"q - quit; do not discard this hunk or any of the remaining ones\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
"y - descarta aquest tros de l'arbre de treball\n"
"n - no descartis aquest tros des de l'arbre de treball\n"
"q - surt; no apliquis aquest tros ni cap dels pendents\n"
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"q - quit; do not discard this hunk or any of the remaining ones\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
"y - descarta aquest tros de l'índex i de l'arbre de treball\n"
"n - no descartis aquest tros des de l'índex i de l'arbre de treball\n"
"q - surt; no apliquis aquest tros ni cap dels pendents\n"
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
"y - aplica aquest tros a l'índex i l'arbre de treball\n"
"n - no apliquis aquest tros des de l'índex i de l'arbre de treball\n"
"q - surt; no apliquis aquest tros ni cap dels pendents\n"
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
#: git-add--interactive.perl:1294
#, fuzzy
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
"y - aplica aquest tros a l'índex i l'arbre de treball\n"
"n - no apliquis aquest tros des de l'índex i de l'arbre de treball\n"
"q - surt; no apliquis aquest tros ni cap dels pendents\n"
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"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"
"s - split the current hunk into smaller hunks\n"
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
"g - selecciona el tros on voleu anar\n"
"/ - cerca un tros que coincideixi amb l'expressió regular donada\n"
"j - deixa aquest tros sense decidir, veure el tros sense decidir següent\n"
"J - deixa aquest tros sense decidir, veure el tros següent\n"
"k - deixa aquest tros sense decidir, veure el tros sense decidir anterior\n"
"K - deixa aquest tros sense decidir, veure el tros anterior\n"
"s - divideix el tros actual en trossos més petits\n"
"e - edita manualment el tros actual\n"
"? - mostra l'ajuda\n"
#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "Els trossos seleccionats no apliquen a l'índex\n"
#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "No s'ha aplicat res.\n"
#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "s'està ignorant %s no fusionat\n"
#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Només s'han canviat els fitxers binaris.\n"
#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Sense canvis.\n"
#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Actualització del pedaç"
#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d"
"%s,?]? "
#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1466
#, fuzzy, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1467
#, fuzzy, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1468
#, fuzzy, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "No hi ha altres trossos on anar-hi\n"
#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "vés a quin tros (<ret> per veure'n més)? "
#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "vés a quin tros? "
#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Número no vàlid: «%s»\n"
#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Només %d tros disponible.\n"
msgstr[1] "Només %d trossos disponibles.\n"
#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "No hi ha cap altre tros a cercar\n"
#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "Cerca per expressió regular? "
#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Expressió regular de cerca mal formada %s: %s\n"
#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Sense tros previ\n"
#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "No hi ha tros següent\n"
#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "No es pot dividir aquest tros\n"
#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Divideix en %d tros.\n"
msgstr[1] "Divideix en %d trossos.\n"
#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "No es pot editar aquest tros\n"
#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Reviseu les diferències"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"revert - revert staged set of changes back to the HEAD version\n"
"patch - pick hunks and update selectively\n"
"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
"status - mostra els camins amb canvis\n"
"update - afegeix l'estat de l'arbre de treball al conjunt de canvis "
"«staged»\n"
"revert - reverteix el conjunt de canvis de «staged» a la versió HEAD\n"
"patch - selecciona trossos i actualitza'ls selectivament\n"
"diff - mostra la diferència entre HEAD i l'índex\n"
"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de "
"canvis «staged»\n"
#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "manca --"
#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "desconegut --patch mode: %s"
#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument %s no vàlid, s'esperava --"
#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "la zona local difereix de GMT per un interval que no és de minuts\n"
#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "el desplaçament de la zona local és més gran o igual a 24 hores\n"
#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'editor no ha sortit correctament, avortant-ho tot"
#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n"
#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' conté el correu redactat.\n"
#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases és incompatible amb altres opcions\n"
#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "No es pot executar git format-patch des de fora del dipòsit\n"
#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Camp --suppress-cc desconegut: «%s»\n"
#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "--confirm setting desconegut: «%s»\n"
#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n"
#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "avís: `:include:` no està suportat: %s\n"
#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "avís: les redireccions `/file` or `|pipe no són admeses: %s\n"
#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "avís: no es pot reconèixer la línia sendmail: %s\n"
#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
"to produce patches for. Please disambiguate by...\n"
"\n"
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
"El fitxer «%s» existeix però també pot ser un rang de comissions\n"
"per produir pedaços. Desambigüeu...\n"
"\n"
" * Dient \"./%s\" si volíeu especificar aquest fitxer; o\n"
" * Proporcionant l'opció --format-patch si volíeu especificar un rang.\n"
#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "S'ha produït un error en obrir el directori %s: %s"
#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
"fatal: %s: %s\n"
"avís: no s'han enviat pedaços\n"
#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
"\n"
"No s'han especificat fitxers de pedaç\n"
"\n"
#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Sense assumpte a %s?"
#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "S'ha produït un error en obrir per escriptura %s: %s"
#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"for the patch you are writing.\n"
"\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
"Se suprimiran les línies que comencen amb \"GIT:\".\n"
"Considereu incloure un diffstat global o una taula de continguts\n"
"per cada pedaç que esteu escrivint.\n"
"\n"
"Netegeu el contingut del cos si no voleu enviar un resum.\n"
#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "S'ha produït un error en obrir %s: %s"
#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "S'ha produït un error en obrir %s.final: %s"
#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "El correu electrònic de resum està buit, s'omet\n"
#. TRANSLATORS: please keep [y/N] as is.
#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Esteu segur que voleu usar <%s> [y/N]? "
#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
"Encoding.\n"
#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"\t%s\n"
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
"want to send.\n"
msgstr ""
"S'ha refusat a enviar perquè el pedaç\n"
"\t%s\n"
"perquè la plantilla té l'assumpte '*** SUBJECT HERE ***'. Passeu --force si "
"realment voleu enviar-lo.\n"
#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n"
#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha "
"cap)? "
#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Què cal fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "el camí CA «%s» no existeix"
#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
" send-email prompts before sending whenever this occurs.\n"
" This behavior is controlled by the sendemail.confirm\n"
" configuration setting.\n"
"\n"
" For additional information, run 'git send-email --help'.\n"
" To retain the current behavior, but squelch this message,\n"
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
" La llista de Cc de sobre s'ha ampliat amb adreces addicionals\n"
" trobades al missatge de la comissió del pedaç. Per defecte, \n"
" send-email pregunta abans d'enviar el missatge quan això succeeix.\n"
" Aquest comportament està controlat pel paràmetre de configuració\n"
" sendemail.confirm.\n"
"\n"
" Per a informació addicional, executeu 'git send-email --help'.\n"
" Per mantenir el comportament actual, però silenciar aquest\n"
" missatge, executeu 'git config --global sendemail.confirm auto'.\n"
"\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[e]dita|[q]surt|[a]tot): "
#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Requereix resposta en enviar el correu"
#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP requerit no està correctament definit."
#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "El servidor no admet STARTTLS! %s"
#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS ha fallat! %s"
#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
"useu --smtp-debug."
#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "S'ha produït un error en enviar %s\n"
#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Simulació d'enviament %s\n"
#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Enviat %s\n"
#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Simulació de correcte. El registre diu:\n"
#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "Correcte. El registre diu: \n"
#: git-send-email.perl:1591
msgid "Result: "
msgstr "Resultat: "
#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Resultat: correcte\n"
#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "no es pot obrir el fitxer %s"
#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n"
#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n"
#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n"
#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no s'ha pogut executar «%s»"
#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) S'està afegint %s: %s des de: «%s»\n"
#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) s'ha produït un error en tancar el conducte «%s»"
#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "no es pot enviar el missatge en 7 bits"
#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "codificació de transferència no vàlida"
#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no s'ha pogut obrir %s: %s\n"
#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: el pedaç conté una línia més gran de 998 caràcters"
#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n"
#. TRANSLATORS: please keep "[y|N]" as is.
#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Esteu segur que voleu enviar %s? [y|N]: "
#, fuzzy
#~ msgid "hash version %X does not match version %X"
#~ msgstr "el camí «%s» no té la seva versió"
#~ msgid "option '%s' requires a value"
#~ msgstr "l'opció «%s» requereix un valor"
#~ msgid "Server supports multi_ack_detailed"
#~ msgstr "El servidor accepta multi_ack_detailed"
#~ msgid "Server supports no-done"
#~ msgstr "El servidor accepta no-done"
#~ msgid "Server supports multi_ack"
#~ msgstr "El servidor accepta multi_ack"
#~ msgid "Server supports side-band-64k"
#~ msgstr "El servidor accepta side-band-64k"
#~ msgid "Server supports side-band"
#~ msgstr "El servidor accepta banda lateral"
#~ msgid "Server supports allow-tip-sha1-in-want"
#~ msgstr "El servidor accepta allow-tip-sha1-in-want"
#~ msgid "Server supports allow-reachable-sha1-in-want"
#~ msgstr "El servidor accepta allow-reachable-sha1-in-want"
#~ msgid "Server supports ofs-delta"
#~ msgstr "El servidor accepta ofs-delta"
#~ msgid "(HEAD detached at %s)"
#~ msgstr "(HEAD separat a %s)"
#~ msgid "(HEAD detached from %s)"
#~ msgstr "(HEAD separat de %s)"
#~ msgid "could not transform the todo list"
#~ msgstr "no s'ha pogut transformar la llista per a fer"
#~ msgid "Checking out files"
#~ msgstr "S'estan agafant fitxers"
#~ msgid "cannot be interactive without stdin connected to a terminal."
#~ msgstr ""
#~ "no es pot ser interactiu sense que stdin estigui connectada a un terminal."
#~ msgid "failed to stat %s\n"
#~ msgstr "s'ha produït un error en fer stat a '%s'\n"
#~ msgid ""
#~ "If you wish to skip this commit, use:\n"
#~ "\n"
#~ " git reset\n"
#~ "\n"
#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
#~ "the remaining commits.\n"
#~ msgstr ""
#~ "Si voleu ometre aquesta comissió, useu:\n"
#~ "\n"
#~ " git reset\n"
#~ "\n"
#~ "Llavors \"git cherry-pick --continue\" reprendrà\n"
#~ "com a «cherry pick» les comissions restants.\n"
#~ msgid "default"
#~ msgstr "per defecte"
#~ msgid "Could not create directory '%s'"
#~ msgstr "No s'ha pogut crear el directori «%s»"
#~ msgid "unrecognized verb: %s"
#~ msgstr "paràmetre no reconegut: %s"
#~ msgid "could not open %s"
#~ msgstr "no s'ha pogut obrir «%s»"
#~ msgid "Could not move back to $head_name"
#~ msgstr "No s'ha pogut tornar a $head_name"
#~ msgid ""
#~ "It seems that there is already a $state_dir_base directory, and\n"
#~ "I wonder if you are in the middle of another rebase. If that is the\n"
#~ "case, please try\n"
#~ "\t$cmd_live_rebase\n"
#~ "If that is not the case, please\n"
#~ "\t$cmd_clear_stale_rebase\n"
#~ "and run me again. I am stopping in case you still have something\n"
#~ "valuable there."
#~ msgstr ""
#~ "Sembla que ja hi ha un directori $state_dir_base, i\n"
#~ "em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n"
#~ "cas, proveu\n"
#~ "\t$cmd_live_rebase\n"
#~ "Si no és el cas, \n"
#~ "\t$cmd_clear_stale_rebase\n"
#~ "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
#~ "de valor."
#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
#~ msgstr "fatal: no es pot combinar «--signoff» amb «--preserve-merges»"
#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
#~ msgstr "fatal: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
#~ msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy-option»"
#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
#~ msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy»"
#, fuzzy
#~ msgid "invalid upstream '$upstream_name'"
#~ msgstr "font no vàlida $upstream_name"
#~ msgid "$onto_name: there are more than one merge bases"
#~ msgstr "$onto_name: ja hi ha més d'una base de fusió"
#~ msgid "$onto_name: there is no merge base"
#~ msgstr "$onto_name: no hi ha cap base de fusió"
#~ msgid "Does not point to a valid commit: $onto_name"
#~ msgstr "No assenyala una comissió vàlida: $onto_name"
#, fuzzy
#~ msgid "fatal: no such branch/commit '$branch_name'"
#~ msgstr "fatal: no hi ha tal branca: $branch_name"
#~ msgid "Created autostash: $stash_abbrev"
#~ msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
#~ msgid "Current branch $branch_name is up to date."
#~ msgstr "La branca actual $branch_name està al dia."
#~ msgid "Current branch $branch_name is up to date, rebase forced."
#~ msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
#~ msgid "Changes to $onto:"
#~ msgstr "Canvis a $onto:"
#~ msgid "Changes from $mb to $onto:"
#~ msgstr "Canvis de $mb a $onto:"
#~ msgid "Fast-forwarded $branch_name to $onto_name."
#~ msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
#~ msgid "First, rewinding head to replay your work on top of it..."
#~ msgstr ""
#~ "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
#~ "damunt..."