kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
54,084 Commits
6 Branches
974 Tags
173 MiB
Commit Graph

54084 Commits (26a567e4c34f20f8d68d8ecc633630d09ab0cc99)

Author SHA1 Message Date
Jiang Xin 26a567e4c3 Merge branch 'master' of https://github.com/vnwildman/git 2018-12-02 10:25:09 +08:00
Tran Ngoc Quan 84368b62b0 l10n: vi(4185t): Updated Vietnamese translation for v2.20.0 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2018-12-02 09:00:09 +07:00
Christopher Diaz Riveros 0960a4beff l10n: es.po v2.20.0 round 1 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2018-12-01 14:09:28 -05:00
Alexander Shopov d0a6644845 l10n: bg.po: Updated Bulgarian translation (4185t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2018-12-01 11:48:08 +01:00
Jiang Xin 36dd6933bd l10n: git.pot: v2.20.0 round 2 (2 new, 2 removed) 
Generate po/git.pot from v2.20.0-rc1-10-g7068cbc4ab for git v2.20.0 l10n
round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2018-12-01 16:15:51 +08:00
Jiang Xin 5d14a9d7c0 Merge branch 'master' of git://github.com/git-l10n/git-po 2018-12-01 16:14:16 +08:00
Jiang Xin 5362f4d97f Merge branch 'master' of git://github.com/alshopov/git-po 2018-12-01 16:13:31 +08:00
Jiang Xin 1a8e317e53 Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 2018-12-01 16:11:45 +08:00
Jiang Xin 9cf1f0d08d Merge branch 'fr_2.20_rnd1' of git://github.com/jnavila/git 2018-12-01 15:36:53 +08:00
Alexander Shopov 3154af4a0d l10n: bg.po: Updated Bulgarian translation (4185t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2018-11-30 23:17:50 +01:00
Peter Krefting 4a81e9cd6d l10n: sv.po: Update Swedish translation (4185t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2018-11-29 12:55:22 +01:00
Junio C Hamano 7068cbc4ab Merge branch 'ja/i18n-fix' 
* ja/i18n-fix:
  i18n: fix small typos
 2018-11-29 16:28:39 +09:00
Junio C Hamano 9ec8af6c9e Merge branch 'nd/n18n-fix' 
* nd/n18n-fix:
  transport-helper.c: do not translate a string twice
 2018-11-29 16:28:39 +09:00
Jean-Noël Avila d355e46a15 i18n: fix small typos 
Translating the new strings introduced for v2.20 showed some typos.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-11-29 15:45:31 +09:00
Nguyễn Thái Ngọc Duy 739fb7167d transport-helper.c: do not translate a string twice 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-11-29 15:30:03 +09:00
Jean-Noël Avila 6b822f7359 l10n: fr.po v2.20 rnd 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2018-11-28 22:16:56 +01:00
Junio C Hamano a1598010f7 Merge branch 'nd/per-worktree-ref-iteration' 
Build fix.

* nd/per-worktree-ref-iteration:
  files-backend.c: fix build error on Solaris
 2018-11-26 23:13:43 +09:00
Junio C Hamano 590e5b88ec Merge branch 'tb/clone-case-smashing-warning-test' 
The code recently added to "git clone" to see if the platform's
filesystem is adequate to check out and use the project code
correctly (e.g. a case smashing filesystem cannot be used for a
project with two files whose paths are different only in case) was
meant to help Windows users, but the test for it was not enabled
for that platform, which has been corrected.

* tb/clone-case-smashing-warning-test:
  t5601-99: Enable colliding file detection for MINGW
 2018-11-26 23:13:42 +09:00
Junio C Hamano ab15ccde3d Merge branch 'jk/t5562-perl-path-fix' 
Hotfix for test breakage on platforms whose Perl is not at
/usr/bin/perl

* jk/t5562-perl-path-fix:
  t5562: fix perl path
 2018-11-26 23:13:42 +09:00
Nguyễn Thái Ngọc Duy 46c0eb5843 files-backend.c: fix build error on Solaris 
This function files_reflog_path returns void, which usually means
"return;" not returning "void value" from another function.

Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-11-26 15:22:58 +09:00
Jordi Mas d9324e4ed0 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2018-11-25 14:53:41 +01:00
Jeff King 8c8fad9e4b t5562: fix perl path 
Some systems do not have perl installed to /usr/bin. Use the variable
from the build settiings, and call perl directly than via shebang.

Signed-off-by: Max Kirillov <max@max630.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-11-24 10:44:30 +09:00
Torsten Bögershausen a7f609ec5f t5601-99: Enable colliding file detection for MINGW 
Commit b878579ae7 (clone: report duplicate entries on case-insensitive
filesystems - 2018-08-17) adds a warning to user when cloning a repo
with case-sensitive file names on a case-insensitive file system.

This test has never been enabled for MINGW.
It had been working since day 1, but I forget to report that to the
author.
Enable it after a re-test.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-11-24 10:41:24 +09:00
Junio C Hamano 7f4e641693 Git 2.20-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-11-21 23:24:52 +09:00
Junio C Hamano 7cb1ea13d4 Sync with 2.19.2 2018-11-21 23:23:48 +09:00
Junio C Hamano 98cdfbb84a Git 2.19.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-11-21 23:22:12 +09:00
Junio C Hamano a4830a7a45 Merge branch 'sg/test-rebase-editor-fix' into maint 
* sg/test-rebase-editor-fix:
  t3404-rebase-interactive: test abbreviated commands
 2018-11-21 22:58:10 +09:00
Junio C Hamano 85eb0f162c Merge branch 'tb/char-may-be-unsigned' into maint 
Build portability fix.

* tb/char-may-be-unsigned:
  path.c: char is not (always) signed
 2018-11-21 22:58:09 +09:00
Junio C Hamano 2b153408b4 Merge branch 'jk/uploadpack-packobjectshook-fix' into maint 
Code clean-up that results in a small bugfix.

* jk/uploadpack-packobjectshook-fix:
  upload-pack: fix broken if/else chain in config callback
 2018-11-21 22:58:09 +09:00
Junio C Hamano 227124b271 Merge branch 'uk/merge-subtree-doc-update' into maint 
Belated documentation update to adjust to a new world order that
happened a yew years ago.

* uk/merge-subtree-doc-update:
  howto/using-merge-subtree: mention --allow-unrelated-histories
 2018-11-21 22:58:08 +09:00
Junio C Hamano 196afc439c Merge branch 'jc/cocci-preincr' into maint 
Code cleanup.

* jc/cocci-preincr:
  fsck: s/++i > 1/i++/
  cocci: simplify "if (++u > 1)" to "if (u++)"
 2018-11-21 22:58:08 +09:00
Junio C Hamano eba14167f1 Merge branch 'ah/doc-updates' into maint 
Doc updates.

* ah/doc-updates:
  doc: fix formatting in git-update-ref
  doc: fix indentation of listing blocks in gitweb.conf.txt
  doc: fix descripion for 'git tag --format'
  doc: fix inappropriate monospace formatting
  doc: fix ASCII art tab spacing
  doc: clarify boundaries of 'git worktree list --porcelain'
 2018-11-21 22:58:07 +09:00
Junio C Hamano b53df43bf5 Merge branch 'sg/doc-show-branch-typofix' into maint 
Docfix.

* sg/doc-show-branch-typofix:
  doc: fix small typo in git show-branch
 2018-11-21 22:58:07 +09:00
Junio C Hamano 69ae6660fc Merge branch 'tq/branch-style-fix' into maint 
Code clean-up.

* tq/branch-style-fix:
  branch: trivial style fix
 2018-11-21 22:58:06 +09:00
Junio C Hamano 2b40fdd079 Merge branch 'tq/branch-create-wo-branch-get' into maint 
Code clean-up.

* tq/branch-create-wo-branch-get:
  builtin/branch.c: remove useless branch_get
 2018-11-21 22:58:06 +09:00
Junio C Hamano c2d6378458 Merge branch 'sb/strbuf-h-update' into maint 
Code clean-up to serve as a BCP example.
Further clean-up patches may want to follow soon.

* sb/strbuf-h-update:
  strbuf.h: format according to coding guidelines
 2018-11-21 22:58:06 +09:00
Junio C Hamano a6dc172d00 Merge branch 'du/cherry-is-plumbing' into maint 
Doc update to mark "git cherry" as a plumbing command.

* du/cherry-is-plumbing:
  doc: move git-cherry to plumbing
 2018-11-21 22:58:05 +09:00
Junio C Hamano c3ba2ae0ba Merge branch 'du/get-tar-commit-id-is-plumbing' into maint 
Doc update to mark "git get-tar-commit-id" as a plumbing command.

* du/get-tar-commit-id-is-plumbing:
  doc: move git-get-tar-commit-id to plumbing
 2018-11-21 22:58:05 +09:00
Junio C Hamano 53016f4c13 Merge branch 'mm/doc-no-dashed-git' into maint 
Doc update.

* mm/doc-no-dashed-git:
  doc: fix a typo and clarify a sentence
 2018-11-21 22:58:05 +09:00
Junio C Hamano 95500c8a0d Merge branch 'du/rev-parse-is-plumbing' into maint 
Doc update.

* du/rev-parse-is-plumbing:
  doc: move git-rev-parse from porcelain to plumbing
 2018-11-21 22:58:04 +09:00
Junio C Hamano 6262f5c471 Merge branch 'ma/t7005-bash-workaround' into maint 
Test fix.

* ma/t7005-bash-workaround:
  t7005-editor: quote filename to fix whitespace-issue
 2018-11-21 22:58:04 +09:00
Junio C Hamano 6b57374d3e Merge branch 'jc/how-to-document-api' into maint 
Doc update.

* jc/how-to-document-api:
  CodingGuidelines: document the API in *.h files
 2018-11-21 22:58:03 +09:00
Junio C Hamano 368ba6b7ac Merge branch 'mw/doc-typofixes' into maint 
Typofixes.

* mw/doc-typofixes:
  docs: typo: s/isimilar/similar/
  docs: graph: remove unnecessary `graph_update()' call
  docs: typo: s/go/to/
 2018-11-21 22:58:03 +09:00
Junio C Hamano 587b3f5d72 Merge branch 'rs/sequencer-oidset-insert-avoids-dups' into maint 
Code clean-up.

* rs/sequencer-oidset-insert-avoids-dups:
  sequencer: use return value of oidset_insert()
 2018-11-21 22:58:02 +09:00
Junio C Hamano 171309399a Merge branch 'ma/mailing-list-address-in-git-help' into maint 
Doc update.

* ma/mailing-list-address-in-git-help:
  git doc: direct bug reporters to mailing list archive
 2018-11-21 22:58:02 +09:00
Junio C Hamano 060d0617ef Merge branch 'nd/packobjectshook-doc-fix' into maint 
Doc update.

* nd/packobjectshook-doc-fix:
  config.txt: correct the note about uploadpack.packObjectsHook
 2018-11-21 22:58:01 +09:00
Junio C Hamano 6f1c8154aa Merge branch 'ma/t1400-undebug-test' into maint 
Test fix.

* ma/t1400-undebug-test:
  t1400: drop debug `echo` to actually execute `test`
 2018-11-21 22:58:01 +09:00
Junio C Hamano 35e54ea2e0 Merge branch 'ma/commit-graph-docs' into maint 
Doc update.

* ma/commit-graph-docs:
  Doc: refer to the "commit-graph file" with dash
  git-commit-graph.txt: refer to "*commit*-graph file"
  git-commit-graph.txt: typeset more in monospace
  git-commit-graph.txt: fix bullet lists
 2018-11-21 22:58:00 +09:00
Junio C Hamano 871955c797 Merge branch 'dz/credential-doc-url-matching-rules' into maint 
Doc update.

* dz/credential-doc-url-matching-rules:
  doc: clarify gitcredentials path component matching
 2018-11-21 22:58:00 +09:00
Junio C Hamano 75266b4e8b Merge branch 'jk/check-everything-connected-is-long-gone' into maint 
Comment fix.

* jk/check-everything-connected-is-long-gone:
  receive-pack: update comment with check_everything_connected
 2018-11-21 22:58:00 +09:00