admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,798 Commits 1 Branch 0 Tags
291ada22cb1762dde06db13a3c5ec5e10c4367a8
Commit Graph

55798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philipp Weißmann
291ada22cb l10n: de.po: Fix typo in German translation 
Fix translation error of "complete => "vollständig" instead of
"unvollständig"

Currently: Documentation states that --unshallow can NOT be used on
INcomplete projects. This is wrong;
Correct would be: --unshallow can NOT be used on complete projects.

This change fixes that error in the German translation.

Signed-off-by: Philipp Weißmann <mail@philipp-weissmann.de>
Reviewed-by: Matthias Rüster <matthias.ruester@gmail.com>
 2019-07-14 16:55:21 +02:00
Carmine Zaccagnino
820419f7c9 l10n: it.po: remove an extra space 
Remove an extra space between the dashes and the start of the
"abort" option.

Signed-off-by: Carmine Zaccagnino <carmine@carminezacc.com>
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2019-06-29 07:51:37 +02:00
Alessandro Menti
505f7b235a l10n: it.po: update the Italian translation 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2019-06-25 21:01:31 +02:00
Dimitriy Ryazantcev
6ff99fc757 l10n: ru.po: update Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2019-06-21 20:46:54 +03:00
Jiang Xin
659c9b496c Merge branch 'master' of https://github.com/Softcatala/git-po 
* 'master' of https://github.com/Softcatala/git-po:
  l10n: Update Catalan translation
 2019-06-08 15:54:29 +08:00
Jordi Mas
197866e4b3 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2019-06-08 08:32:49 +02:00
Junio C Hamano
b697d92f56 Git 2.22 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-06-07 09:39:21 -07:00
Junio C Hamano
6ee1eaca3e Merge tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po 
l10n-2.22.0-rnd3

* tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po: (25 commits)
  l10n: fr.po: Review French translation
  l10n: de.po: Update German translation
  l10n: de.po: improve description of 'git reset --quiet'
  l10n: TEAMS: Change German translation team leader
  l10n: bg.po: Updated Bulgarian translation (4581t)
  l10n: zh_CN: Revision for git v2.22.0 l10n
  l10n: zh_CN: for git v2.22.0 l10n round 1~3
  l10n: es: 2.22.0 round 3
  l10n: it.po: Updated Italian translation
  l10n: fr v2.22.0 rnd 3
  l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3
  l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed)
  l10n: es: 2.22.0 round 2
  l10n: bg.po: Updated Bulgarian translation (4580t)
  l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2
  l10n: fr.po v2.22.0 round 2
  l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed)
  l10n: bg.po: Updated Bulgarian translation (4577t)
  l10n: es: 2.22.0 round 1
  l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1
  ...
 2019-06-07 09:36:32 -07:00
Jiang Xin
0cdb8d2db2 Merge branch 'fr_review' of git://github.com/jnavila/git 
* 'fr_review' of git://github.com/jnavila/git:
  l10n: fr.po: Review French translation
 2019-06-07 16:51:09 +08:00
Jiang Xin
d014920079 Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4581t)
 2019-06-07 16:50:23 +08:00
Cédric Malard
82eb147dbb l10n: fr.po: Review French translation 
Signed-off-by: Cédric Malard <c.malard-git@valdun.net>
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2019-06-07 08:54:28 +02:00
Junio C Hamano
20fbf7dd42 Merge branch 'en/merge-directory-renames-fix' 
Recent code restructuring of merge-recursive engine introduced a
regression dealing with rename/add conflict.

* en/merge-directory-renames-fix:
  merge-recursive: restore accidentally dropped setting of path
 2019-06-06 14:03:36 -07:00
Matthias Rüster
219829ae83 l10n: de.po: Update German translation 
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2019-06-06 07:03:26 +02:00
Ralf Thielow
8c18948b78 l10n: de.po: improve description of 'git reset --quiet' 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2019-06-06 07:03:25 +02:00
Matthias Rüster
d314d77577 l10n: TEAMS: Change German translation team leader 
Acked-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2019-06-05 20:48:37 +02:00
Elijah Newren
481de8a293 merge-recursive: restore accidentally dropped setting of path 
In commit 8daec1df03 ("merge-recursive: switch from (oid,mode) pairs
to a diff_filespec", 2019-04-05), we actually switched from
(oid,mode,path) triplets to a diff_filespec -- but most callsites in the
patch only needed to worry about oid and mode so the commit message
focused on that.  The oversight in the commit message apparently spilled
over to the code as well; one of the dozen or so callsites accidentally
dropped the setting of the path in the conversion.  Restore the path
setting in that location.

Also, this pointed out that our testsuite was lacking a good rename/add
test, at least one that involved the need for merge content with the
rename.  Add such a test, and since rename/add vs. add/rename could
possibly be important, redo the merge the opposite direction to make
sure we don't have issues with the direction of the merge.  These
testcases failed before restoring the setting of path, but with the
paths appropriately set the testcases both pass.

Reported-by: Ben Humphreys <behumphreys@atlassian.com>
Based-on-patch-by: SZEDER Gábor <szeder.dev@gmail.com>
Tested-by: Ben Humphreys <behumphreys@atlassian.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-06-05 09:30:40 -07:00
Alexander Shopov
de2b0545ee l10n: bg.po: Updated Bulgarian translation (4581t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2019-06-05 08:51:15 +02:00
Fangyi Zhou
5b5336320b l10n: zh_CN: Revision for git v2.22.0 l10n 
Revise 51 translations, improving consistency for some phrased.
Update email address for Fangyi Zhou

Signed-off-by: Fangyi Zhou <me@fangyi.io>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-06-05 08:37:30 +08:00
Jiang Xin
d46c551928 l10n: zh_CN: for git v2.22.0 l10n round 1~3 
Translate 274 new messages (4581t0f0u) for git 2.22.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-06-05 08:37:30 +08:00
Jiang Xin
914bd0923e Merge branch '2.22' of https://github.com/ChrisADR/git-po 
* '2.22' of https://github.com/ChrisADR/git-po:
  l10n: es: 2.22.0 round 3
 2019-06-05 08:35:35 +08:00
Jiang Xin
488ed582d3 Merge branch 'it-l10n-wip' of github.com:AlessandroMenti/git-po 
* 'it-l10n-wip' of github.com:AlessandroMenti/git-po:
  l10n: it.po: Updated Italian translation
 2019-06-05 08:17:28 +08:00
Christopher Diaz Riveros
922a0a7d98 l10n: es: 2.22.0 round 3 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2019-06-04 18:52:28 -05:00
Alessandro Menti
bbc55709e7 l10n: it.po: Updated Italian translation 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2019-06-04 22:27:19 +02:00
Jean-Noël Avila
85b66ac50d l10n: fr v2.22.0 rnd 3 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2019-06-04 19:53:32 +02:00
Tran Ngoc Quan
77e1962193 l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2019-06-04 08:13:53 +07:00
Jiang Xin
386544cd84 l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed) 
Generate po/git.pot from v2.22.0-rc3 for git v2.22.0 l10n round 3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-06-04 08:27:36 +08:00
Jiang Xin
b50e1c093c Merge branch 'master' of git://git.kernel.org/pub/scm/git/git 
* 'master' of git://git.kernel.org/pub/scm/git/git:
  Git 2.22-rc3
  i18n: fix typos found during l10n for git 2.22.0
  RelNotes: minor typo fixes in 2.22.0 draft
  list-objects-filter: disable 'sparse:path' filters
 2019-06-04 08:24:28 +08:00
Junio C Hamano
74583d8912 Git 2.22-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-06-03 11:25:12 -07:00
Junio C Hamano
4a787f72f5 Merge branch 'cc/list-objects-filter-wo-sparse-path' 
Disable "--filter=sparse:path=<path>" that would allow reading from
paths on the filesystem.

* cc/list-objects-filter-wo-sparse-path:
  list-objects-filter: disable 'sparse:path' filters
 2019-06-03 11:18:54 -07:00
Jiang Xin
8a1569d655 i18n: fix typos found during l10n for git 2.22.0 
Fix two typos introduced by the following commits:

+ 31fba9d3b4 (diff-parseopt: convert --[src|dst]-prefix, 2019-03-24)
+ ed8b4132c8 (remote-curl: mark all error messages for translation,
  2019-03-05)

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-06-03 11:10:53 -07:00
Todd Zullinger
ee70b40e8d RelNotes: minor typo fixes in 2.22.0 draft 
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-06-03 11:06:18 -07:00
Christopher Diaz Riveros
1c8ba5f1b3 l10n: es: 2.22.0 round 2 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2019-06-03 09:34:50 -05:00
Jiang Xin
cb56cf3b2d Merge branch 'master' of https://github.com/vnwildman/git 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2
 2019-06-02 22:35:11 +08:00
Jiang Xin
c181f4d2d7 Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4580t)
 2019-06-02 22:09:35 +08:00
Alexander Shopov
9c21d45420 l10n: bg.po: Updated Bulgarian translation (4580t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2019-06-02 09:26:52 +02:00
Tran Ngoc Quan
35655fe726 l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2019-06-01 08:37:57 +07:00
Jean-Noël Avila
fc8703c9f6 l10n: fr.po v2.22.0 round 2 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2019-05-31 10:46:21 +02:00
Jiang Xin
c08fd7307c l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed) 
Generate po/git.pot from v2.22.0-rc2 for git v2.22.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-05-31 14:36:22 +08:00
Jiang Xin
a17177ce3a Merge branch 'master' of git://git.kernel.org/pub/scm/git/git 
* 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits)
  Git 2.22-rc2
  ...
 2019-05-31 14:34:26 +08:00
Jiang Xin
ea8a8d04c3 Merge branch 'master' of https://github.com/Softcatala/git-po 
* 'master' of https://github.com/Softcatala/git-po:
  l10n: Update Catalan translation
 2019-05-31 14:32:35 +08:00
Junio C Hamano
874dd410ce Git 2.22-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-05-30 10:56:29 -07:00
Junio C Hamano
8feb8e27e7 Merge branch 'js/rebase-config-bitfix' 
* js/rebase-config-bitfix:
  rebase: replace incorrect logical negation by correct bitwise one
 2019-05-30 10:50:47 -07:00
Junio C Hamano
c41b1197ec Merge branch 'es/doc-gitsubmodules-markup' 
Doc markup fix.

* es/doc-gitsubmodules-markup:
  gitsubmodules: align html and nroff lists
 2019-05-30 10:50:46 -07:00
Junio C Hamano
936dce6f93 Merge branch 'ja/diff-opt-typofix' 
Typofix.

* ja/diff-opt-typofix:
  diff: fix mistake in translatable strings
 2019-05-30 10:50:46 -07:00
Junio C Hamano
0e5387cd02 Merge branch 'jt/clone-server-option' 
A brown-paper-bag bugfix to a change already in 'master'.

* jt/clone-server-option:
  fetch-pack: send server options after command
 2019-05-30 10:50:46 -07:00
Junio C Hamano
fa03d9c699 Merge branch 'sg/progress-off-by-one-fix' 
A brown-paper-bag bugfix to a change already in 'master'.

* sg/progress-off-by-one-fix:
  progress: avoid empty line when breaking the progress line
 2019-05-30 10:50:45 -07:00
Junio C Hamano
2656eceae7 Merge branch 'js/rebase-deprecate-preserve-merges' 
A bit more leftover clean-up to deprepcate "rebase -p".

* js/rebase-deprecate-preserve-merges:
  rebase docs: recommend `-r` over `-p`
  docs: say that `--rebase=preserve` is deprecated
  tests: mark a couple more test cases as requiring `rebase -p`
 2019-05-30 10:50:45 -07:00
Junio C Hamano
463dca6476 Merge branch 'sg/trace2-rename' 
Rename environment variables that are used to control the "trace2"
mechanism to a more readable name.

* sg/trace2-rename:
  trace2: document the supported values of GIT_TRACE2* env variables
  trace2: rename environment variables to GIT_TRACE2*
 2019-05-30 10:50:45 -07:00
Junio C Hamano
90f2d88e61 Merge branch 'jh/trace2' 
* jh/trace2:
  trace2: fix tracing when NO_PTHREADS is defined
 2019-05-30 10:50:45 -07:00
Junio C Hamano
20aa7c594f Merge branch 'nd/diff-parseopt' 
A brown-paper-bag bugfix to a change already in 'master'.

* nd/diff-parseopt:
  parse-options: check empty value in OPT_INTEGER and OPT_ABBREV
  diff-parseopt: restore -U (no argument) behavior
  diff-parseopt: correct variable types that are used by parseopt
 2019-05-30 10:50:44 -07:00