development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-29 17:08:46 +00:00
Code Issues Projects Releases Packages Wiki Activity
70299 commits 6 branches 956 tags 485 MiB
Commit graph

70299 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philippe Blain
3b698111d5 completion: complete --unified 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:13 -07:00
Philippe Blain
b5c3edc17e completion: complete --output-indicator-{context,new,old} 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:13 -07:00
Philippe Blain
8fe2bd7905 completion: complete --output 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:13 -07:00
Philippe Blain
5727be06c6 completion: complete --no-stat 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:13 -07:00
Philippe Blain
ffcccc62b0 completion: complete --no-relative 
Add --no-relative to __git_diff_common_options in the completion script,
and move --relative from __git_diff_difftool_options to
__git_diff_common_options since it applies to more than just diff and
difftool.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:12 -07:00
Philippe Blain
3a4d453246 completion: complete --line-prefix 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:12 -07:00
Philippe Blain
08a9a6d615 completion: complete --ita-invisible-in-index and --ita-visible-in-index 
The options --ita-invisible-in-index and --ita-visible-in-index are
listed in diff-options.txt and so are included in the documentation of
commands which include this file (diff, diff-*, log, show, format-patch)
but they only make sense for diffs relating to the index. As such, add
them to '__git_diff_difftool_options' instead of
'__git_diff_common_options' since it makes more sense to add them there.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:12 -07:00
Philippe Blain
8885532abb completion: complete --irreversible-delete 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:12 -07:00
Philippe Blain
b454ed2c5d completion: complete --ignore-matching-lines 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:11 -07:00
Philippe Blain
57159d5daa completion: complete --function-context 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:11 -07:00
Philippe Blain
1eb638a5db completion: complete --find-renames 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:11 -07:00
Philippe Blain
04d430ff8d completion: complete --find-object 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:11 -07:00
Philippe Blain
2f677ad348 completion: complete --find-copies 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:11 -07:00
Philippe Blain
a4d13aaf22 completion: complete --default-prefix 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:11 -07:00
Philippe Blain
fd9058649a completion: complete --compact-summary 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:10 -07:00
Philippe Blain
de4898d7d8 completion: complete --combined-all-paths 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:10 -07:00
Philippe Blain
93ec6111a6 completion: complete --cc 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:10 -07:00
Philippe Blain
6a38b0a0dc completion: complete --break-rewrites 
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:10 -07:00
Philippe Blain
f0b9e15378 completion: add comments describing __git_diff_* globals 
Add descriptive comments for '__git_diff_common_options' and
'__git_diff_difftool_options', so that it is clearer when looking at
these variables to know in which command's completion they are used.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-26 09:40:10 -07:00
Junio C Hamano
fe86abd751 Git 2.41 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-06-01 15:28:26 +09:00
Junio C Hamano
ee65a63819 l10n-2.41.0-2 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE37vMEzKDqYvVxs51k24VDd1FMtUFAmR349EACgkQk24VDd1F
 MtU+cw/9FM3mkn3Ij8l+ysMQAGcmIy9wErhDqVDSf1AugjhXhvLRRd4+iYrwj1/g
 +celqYCxjUkV5A3cSA/FRsRabZJTBpbp1l2spsSfwdXNMZ1DH2HAc7ZZK5DFF/no
 EGYXvAX0wSrXTk1quqoRwgcUOn0zfMTrAnXgUpLcALf6DLLs0mwGmu8Q1oe4Mo++
 6RMAvc3zfyqyMasxccpk81KSAYRL+bnt0yGW4i9ZT1iltgeDj/5BDxug2MLd7GeR
 2nbSNxPLE4MMnUgR/3HRpt9KOXg3jWTvf6Wb23+gtZkNJahP37L7IEkGtEeB38ZP
 b/Mlyx7BRUuLe4Nx8Dn1H+ngJFVrGZxGeRzminkx7G6J2mmWNjDDA8T4PwiRkgux
 lR86pq7VXR50EEkSaKBza6iOCMBblzrvxw/A3qmgdgWYZ56qzcouIBwVcbk9Q+dy
 aL/DaJozvlhqeVq+jx6oebgKg1iZjCVILZDcBS4VcFD5td0yHLAxuaMTpZS2xXMy
 3XULWpyyBfD/XG5xlJKTaYG9e4YOogtuTzBBWsfA/ShD+ZDiVQlT1HLi/5I0oPzp
 +/w6YGpVMdKBJCw3SxQV4WUOZkU76ZPdvzE8TTQGN+4wZu/IWuIKmkm9dG5gyy0g
 q8XWO332nZvG76b5epq+FSIi5yEpR8DGQe7NNNGcHVBA9fAbbvg=
 =ddDo
 -----END PGP SIGNATURE-----

Merge tag 'l10n-2.41.0-2' of https://github.com/git-l10n/git-po

l10n-2.41.0-2

* tag 'l10n-2.41.0-2' of https://github.com/git-l10n/git-po:
  l10n: zh_TW.po: Git 2.41.0
  l10n: sv.po: Update Swedish translation (5515t0f0u)
  l10n: Update Catalan translation
  l10n: Update German translation
  l10n: po-id for 2.41 (round 1)
  l10n: Update Catalan translation
  l10n: tr: Update Turkish translations for 2.41.0
  l10n: fr.po v2.41.0 rnd2
  l10n: fr.po v2.41.0 rnd1
  l10n: fr: fix translation of stash save help
  l10n: zh_CN: Git 2.41.0 round #1
  l10n: bg.po: Updated Bulgarian translation (5515t)
  l10n: update uk localization
  l10n: uk: remove stale lines
  l10n: uk: add initial translation
  l10n: TEAMS: Update pt_PT repo link
 2023-06-01 15:27:43 +09:00
Yi-Jyun Pan
f86de088f8
l10n: zh_TW.po: Git 2.41.0 
Co-authored-by: Peter Dave Hello <hsu@peterdavehello.org>
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
 2023-06-01 00:53:09 +08:00
Jiang Xin
81a797fcdf Merge branch 'add-uk-initial-l10n' of github.com:arkid15r/git-ukrainian-l10n 
* 'add-uk-initial-l10n' of github.com:arkid15r/git-ukrainian-l10n:
  l10n: update uk localization
  l10n: uk: remove stale lines
  l10n: uk: add initial translation
 2023-05-31 21:11:25 +08:00
Peter Krefting
308f3f4e9a l10n: sv.po: Update Swedish translation (5515t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2023-05-31 13:16:21 +01:00
Jordi Mas
aa1991d080 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2023-05-26 20:02:14 +02:00
Jiang Xin
97e736c4cc Merge branch 'l10n-de-2.41' of github.com:ralfth/git 
* 'l10n-de-2.41' of github.com:ralfth/git:
  l10n: Update German translation
 2023-05-25 14:06:01 +08:00
Jiang Xin
2f88193dac Merge branch 'catalan' of github.com:Softcatala/git-po 
* 'catalan' of github.com:Softcatala/git-po:
  l10n: Update Catalan translation
 2023-05-25 14:05:21 +08:00
Jiang Xin
4d34454e2c Merge branch 'tr' of github.com:bitigchi/git-po 
* 'tr' of github.com:bitigchi/git-po:
  l10n: tr: Update Turkish translations for 2.41.0
 2023-05-25 14:04:42 +08:00
Jiang Xin
08af8c4c48 Merge branch 'main' of github.com:alshopov/git-po 
* 'main' of github.com:alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (5515t)
 2023-05-25 14:03:58 +08:00
Jiang Xin
10553acb0e Merge branch 'fr_2.41.0_rnd1' of github.com:jnavila/git 
* 'fr_2.41.0_rnd1' of github.com:jnavila/git:
  l10n: fr.po v2.41.0 rnd2
  l10n: fr.po v2.41.0 rnd1
  l10n: fr: fix translation of stash save help
 2023-05-25 14:03:22 +08:00
Jiang Xin
07d6730b39 Merge branch 'po-id' of github.com:bagasme/git-po 
* 'po-id' of github.com:bagasme/git-po:
  l10n: po-id for 2.41 (round 1)
 2023-05-25 14:01:59 +08:00
Jiang Xin
f9bb784ab9 Merge branch 'tl/zh_CN_2.41.0_rnd1' of github.com:dyrone/git 
* 'tl/zh_CN_2.41.0_rnd1' of github.com:dyrone/git:
  l10n: zh_CN: Git 2.41.0 round #1
 2023-05-25 13:58:10 +08:00
Junio C Hamano
79bdd48716 Git 2.41-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-05-25 05:55:19 +09:00
Junio C Hamano
6a6621fe9a Merge branch 'sl/sparse-write-tree-part-2' 
Fix-up to a topic already graduated to 'master'.

* sl/sparse-write-tree-part-2:
  t1092: update a write-tree test
 2023-05-25 05:53:55 +09:00
Ralf Thielow
5eaa027972 l10n: Update German translation 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Matthias Rüster <matthias.ruester@gmail.com>
 2023-05-22 17:17:49 +02:00
Bagas Sanjaya
5aab7179a2 l10n: po-id for 2.41 (round 1) 
Update following components:

  * advice.c
  * archive.c
  * attr.c
  * config.c
  * pack-revindex.c
  * builtin/branch.c
  * builtin/bundle.c
  * builtin/pack-redundant.c
  * builtin/rebase.c
  * builtin/sparse-checkout.c

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
 2023-05-22 15:25:32 +07:00
Jordi Mas
0c0ffcd2b8 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2023-05-20 14:09:46 +02:00
Emir SARI
6f20bdbffe l10n: tr: Update Turkish translations for 2.41.0 
Signed-off-by: Emir SARI <emir_sari@icloud.com>
 2023-05-20 13:58:15 +03:00
Jean-Noël Avila
82e70690d4 l10n: fr.po v2.41.0 rnd2 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2023-05-20 12:43:10 +02:00
Jean-Noël Avila
5076d955f3 l10n: fr.po v2.41.0 rnd1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2023-05-20 12:23:19 +02:00
Benjamin Jorand
460ba0869d l10n: fr: fix translation of stash save help 
Signed-off-by: Benjamin Jorand <benjamin.jorand@doctolib.com>
 2023-05-20 12:23:19 +02:00
Teng Long
407b144f35 l10n: zh_CN: Git 2.41.0 round #1 
Signed-off-by: Teng Long <dyroneteng@gmail.com>
Reviewed-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Reviewed-by: 依云 <lilydjwg@gmail.com>
Reviewed-by: pan93412 <pan93412@gmail.com>
Reviewed0by: Fangyi Zhou <me@fangyi.io>
 2023-05-20 18:06:20 +08:00
Jiang Xin
68a86d028b Merge branch 'master' of github.com:git/git 
* 'master' of github.com:git/git:
  A few more topics after 2.41-rc1
  Git 2.41-rc1
  t/lib-httpd: make CGIPassAuth support conditional
  t9001: mark the script as no longer leak checker clean
  send-email: clear the $message_id after validation
  upload-pack: advertise capabilities when cloning empty repos
  A bit more before -rc1
  imap-send: include strbuf.h
  run-command.c: fix missing include under `NO_PTHREADS`
  test: do not negate test_path_is_* to assert absense
  t2021: do not negate test_path_is_dir
  tests: do not negate test_path_exists
  doc/git-config: add unit for http.lowSpeedLimit
  rebase -r: fix the total number shown in the progress
  rebase --update-refs: fix loops
  attr: teach "--attr-source=<tree>" global option to "git"
 2023-05-20 08:44:08 +08:00
Junio C Hamano
9e49351c30 A few more topics after 2.41-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-05-20 05:35:57 +09:00
Junio C Hamano
cacc15ee3f Merge branch 'js/rebase-count-fixes' 
A few bugs in the sequencer machinery that results in miscounting
the steps have been corrected.

* js/rebase-count-fixes:
  rebase -r: fix the total number shown in the progress
  rebase --update-refs: fix loops
 2023-05-20 05:35:57 +09:00
Junio C Hamano
dc3fd2486f Merge branch 'jc/do-not-negate-test-helpers' 
Small fixes.

* jc/do-not-negate-test-helpers:
  test: do not negate test_path_is_* to assert absense
  t2021: do not negate test_path_is_dir
  tests: do not negate test_path_exists
 2023-05-20 05:35:56 +09:00
Junio C Hamano
1f141d6cb2 Merge branch 'cg/doc-http-lowspeed-limit' 
Doc update.

* cg/doc-http-lowspeed-limit:
  doc/git-config: add unit for http.lowSpeedLimit
 2023-05-20 05:35:56 +09:00
Alexander Shopov
6d438bf3e4 l10n: bg.po: Updated Bulgarian translation (5515t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2023-05-19 19:58:56 +02:00
Junio C Hamano
4a714b3702 Git 2.41-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-05-19 09:27:07 -07:00
Junio C Hamano
646ca89558 Merge branch 'jk/http-test-cgipassauth-unavailable-in-older-apache' 
We started unconditionally testing with CGIPassAuth directive but
it is unavailable in older Apache that ships with CentOS 7 that has
about a year of shelf-life still left.  The test has conditionally
been disabled when running with an ancient Apache.  This was a fix
for a recent regression caught before the release, so no need to
mention it in the release notes.

* jk/http-test-cgipassauth-unavailable-in-older-apache:
  t/lib-httpd: make CGIPassAuth support conditional
 2023-05-19 09:27:07 -07:00