undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,887 Commits 1 Branch 0 Tags 217 MiB
c9741bb98e
Commit Graph

49887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ralf Thielow
c9741bb98e l10n: de.po: translate 72 new messages 
Translate 72 new messages came from git.pot update in 18a907225 (l10n:
git.pot: v2.16.0 round 1 (64 new, 25 removed)) and 005c62fe4 (l10n:
git.pot: v2.16.0 round 2 (8 new, 4 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
 2018-01-15 07:47:30 +01:00
Ralf Thielow
31eaa14e81 l10n: de.po: improve messages when a branch starts to track another ref 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2018-01-15 07:47:30 +01:00
Alexander Shopov
1b6d5e83b6 l10n: bg.po: Updated Bulgarian translation (3288t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2018-01-11 22:02:02 +01:00
Jiang Xin
0d08328dd8 l10n: TEAMS: add zh_CN team members 
Add Fangyi Zhou to zh_CN l10n team members.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2018-01-10 11:31:55 +08:00
Jiang Xin
5809aa05f7 l10n: zh_CN: for git v2.16.0 l10n round 2 
Translate 72 messages (3288t0f0u) for git v2.16.0-rc1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: 依云 <lilydjwg@gmail.com>
Reviewed-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
 2018-01-10 11:31:32 +08:00
Jiang Xin
dfb5c4c15b Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 
* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (3288t0f0u)
 2018-01-10 11:30:04 +08:00
Jiang Xin
45498f08b6 Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru 
* 'russian-l10n' of https://github.com/DJm00n/git-po-ru:
  l10n: ru.po: update Russian translation
 2018-01-10 11:28:56 +08:00
Peter Krefting
9d4b85be54 l10n: sv.po: Update Swedish translation (3288t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2018-01-09 20:10:14 +01:00
Dimitriy Ryazantcev
846bb11707 l10n: ru.po: update Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2018-01-09 13:22:24 +02:00
Changwoo Ryu
4b0d6bdafa l10n: TEAMS: Add ko team members 
Add Gwan-gyeong Mun and Sihyeon Jang.

Signed-off-by: Changwoo Ryu <cwryu@debian.org>
 2018-01-09 11:42:03 +09:00
Jiang Xin
77482d05d4 Merge branch 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-ko 
* 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-ko:
  l10n: ko.po: Update Korean translation
 2018-01-09 09:47:11 +08:00
Changwoo Ryu
4a7e1b2475 l10n: ko.po: Update Korean translation 
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
Signed-off-by: Sihyeon Jang <uneedsihyeon@gmail.com>
Signed-off-by: Gwan-gyeong Mun <elongbug@gmail.com>
Reviewed-by: Changwoo Ryu <cwryu@debian.org>
 2018-01-08 17:59:35 +09:00
Jiang Xin
daa8563143 Merge branch '2.16' of https://github.com/ChrisADR/git-po 
* '2.16' of https://github.com/ChrisADR/git-po:
  l10n: es.po: Spanish translation 2.16.0 round 2
 2018-01-08 10:59:24 +08:00
Jiang Xin
9c315b944d Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/git 
* 'fr_2.16-rc1' of git://github.com/jnavila/git:
  l10n: fr.po 2.16 round 2
 2018-01-08 09:17:24 +08:00
Jean-Noel Avila
2acb3d4992 l10n: fr.po 2.16 round 2 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2018-01-07 18:57:48 +01:00
Christopher Díaz Riveros
521437fe7c l10n: es.po: Spanish translation 2.16.0 round 2 
Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
 2018-01-07 12:15:35 -05:00
Tran Ngoc Quan
fe73f3eecc l10n: vi.po(3288t): Updated Vietnamese translation for v2.16.0 round 2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2018-01-07 08:20:27 +07:00
Jiang Xin
005c62fe46 l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed) 
Generate po/git.pot from v2.16.0-rc1 for git v2.16.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2018-01-07 07:50:31 +08:00
Jiang Xin
7398243260 Merge branch 'master' of git://github.com/git-l10n/git-po 
* 'master' of git://github.com/git-l10n/git-po:
  l10n: es.po: Update Spanish Translation v2.16.0
  l10n: fr.po v2.16.0 round 1
  l10n: bg.po: Updated Bulgarian translation (3284t)
  l10n: sv.po: Update Swedish translation (3284t0f0u)
  l10n: fr.po: "worktree list" mistranslated as prune
  l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed)
  l10n: fixes to German translation
  l10n: Update Spanish translation
  l10n: zh_CN translate parameter name
  l10n: zh_CN Fix typo
  l10n: Fixes to Catalan translation
 2018-01-07 07:49:43 +08:00
Jiang Xin
48f2a74589 Merge branch '2.16' of https://github.com/ChrisADR/git-po 
* '2.16' of https://github.com/ChrisADR/git-po:
  l10n: es.po: Update Spanish Translation v2.16.0
 2018-01-06 10:26:30 +08:00
Jiang Xin
4a6b2cb588 Merge branch 'fr_2.16' of git://github.com/jnavila/git 
* 'fr_2.16' of git://github.com/jnavila/git:
  l10n: fr.po v2.16.0 round 1
  l10n: fr.po: "worktree list" mistranslated as prune
 2018-01-06 10:24:52 +08:00
Junio C Hamano
36438dc19d Git 2.16-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-01-05 13:45:17 -08:00
Junio C Hamano
8c8ddbd082 Merge branch 'js/sequencer-cleanups' 
Code cleanup.

* js/sequencer-cleanups:
  sequencer: do not invent whitespace when transforming OIDs
  sequencer: report when noop has an argument
  sequencer: remove superfluous conditional
  sequencer: strip bogus LF at end of error messages
  rebase: do not continue when the todo list generation failed
 2018-01-05 13:28:12 -08:00
Junio C Hamano
bc27a2e2fc Merge branch 'jh/memihash-opt' 
Squelch compiler warning.

* jh/memihash-opt:
  t/helper/test-lazy-name-hash: fix compilation
 2018-01-05 13:28:11 -08:00
Junio C Hamano
e82bbcbf60 Merge branch 'tb/test-lint-wc-l' 
Test update.

* tb/test-lint-wc-l:
  check-non-portable-shell.pl: `wc -l` may have leading WS
 2018-01-05 13:28:11 -08:00
Junio C Hamano
0956eaa621 Merge branch 'rs/use-argv-array-in-child-process' 
Code cleanup.

* rs/use-argv-array-in-child-process:
  send-pack: use internal argv_array of struct child_process
  http: use internal argv_array of struct child_process
 2018-01-05 13:28:10 -08:00
Junio C Hamano
a778ba1c71 Merge branch 'ld/p4-multiple-shelves' 
"git p4" update.

* ld/p4-multiple-shelves:
  git-p4: update multiple shelved change lists
 2018-01-05 13:28:10 -08:00
Junio C Hamano
a741e2825b Merge branch 'jd/fix-strbuf-add-urlencode-bytes' 
Bytes with high-bit set were encoded incorrectly and made
credential helper fail.

* jd/fix-strbuf-add-urlencode-bytes:
  strbuf: fix urlencode format string on signed char
 2018-01-05 13:28:10 -08:00
Junio C Hamano
843d94b3cd Merge branch 'ew/empty-merge-with-dirty-index' 
"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.

* ew/empty-merge-with-dirty-index:
  merge-recursive: avoid incorporating uncommitted changes in a merge
  move index_has_changes() from builtin/am.c to merge.c for reuse
  t6044: recursive can silently incorporate dirty changes in a merge
 2018-01-05 13:28:09 -08:00
Junio C Hamano
fa62d0392b Merge branch 'db/doc-config-section-names-with-bs' 
Doc update.

* db/doc-config-section-names-with-bs:
  config.txt: document behavior of backslashes in subsections
 2018-01-05 13:28:09 -08:00
Junio C Hamano
07b747d324 Merge branch 'jk/test-suite-tracing' 
Assorted fixes around running tests with "-x" tracing option.

* jk/test-suite-tracing:
  t/Makefile: introduce TEST_SHELL_PATH
  test-lib: make "-x" work with "--verbose-log"
  t5615: avoid re-using descriptor 4
  test-lib: silence "-x" cleanup under bash
 2018-01-05 13:28:09 -08:00
Christopher Díaz Riveros
f8038f5b2a l10n: es.po: Update Spanish Translation v2.16.0 
Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
 2018-01-04 16:06:40 -05:00
Jean-Noel Avila
5da312d11c l10n: fr.po v2.16.0 round 1 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2018-01-02 22:06:39 +01:00
Jiang Xin
9a08e9a72b Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (3284t)
 2018-01-02 22:45:47 +08:00
Alexander Shopov
29f90338df l10n: bg.po: Updated Bulgarian translation (3284t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2018-01-01 22:13:22 +01:00
Peter Krefting
9e3ea3b555 l10n: sv.po: Update Swedish translation (3284t0f0u) 
Also corrected spelling.

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2018-01-01 09:38:15 +01:00
Louis Bettens
04e47a7f55 l10n: fr.po: "worktree list" mistranslated as prune 
Signed-off-by: Louis Bettens <louis@bettens.info>
 2017-12-31 16:30:28 +01:00
Jiang Xin
dd5fc1d977 Merge branch 'maint' of git://github.com/git-l10n/git-po 
* 'maint' of git://github.com/git-l10n/git-po:
  l10n: fixes to German translation
  l10n: Update Spanish translation
  l10n: zh_CN translate parameter name
  l10n: zh_CN Fix typo
  l10n: Fixes to Catalan translation
 2017-12-31 10:48:20 +08:00
Jiang Xin
18a9072257 l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed) 
Generate po/git.pot from v2.16.0-rc0 for git v2.16.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2017-12-31 10:46:19 +08:00
Junio C Hamano
1eaabe34fc Git 2.16-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2017-12-28 14:12:06 -08:00
Junio C Hamano
556de1a8e3 Merge branch 'sb/describe-blob' 
"git describe" was taught to dig trees deeper to find a
<commit-ish>:<path> that refers to a given blob object.

* sb/describe-blob:
  builtin/describe.c: describe a blob
  builtin/describe.c: factor out describe_commit
  builtin/describe.c: print debug statements earlier
  builtin/describe.c: rename `oid` to avoid variable shadowing
  revision.h: introduce blob/tree walking in order of the commits
  list-objects.c: factor out traverse_trees_and_blobs
  t6120: fix typo in test name
 2017-12-28 14:08:50 -08:00
Junio C Hamano
0433d533f1 Merge branch 'hi/merge-verify-sig-config' 
"git merge" learned to pay attention to merge.verifySignatures
configuration variable and pretend as if '--verify-signatures'
option was given from the command line.

* hi/merge-verify-sig-config:
  t5573, t7612: clean up after unexpected success of 'pull' and 'merge'
  t: add tests for pull --verify-signatures
  merge: add config option for verifySignatures
 2017-12-28 14:08:50 -08:00
Junio C Hamano
fc4a226bf6 Merge branch 'ws/curl-http-proxy-over-https' 
Git has been taught to support an https:// URL used for http.proxy
when using recent versions of libcurl.

* ws/curl-http-proxy-over-https:
  http: support CURLPROXY_HTTPS
 2017-12-28 14:08:50 -08:00
Junio C Hamano
f53edaf2d5 Merge branch 'ks/doc-previous-checkout' 
Doc update.

* ks/doc-previous-checkout:
  Doc/check-ref-format: clarify information about @{-N} syntax
 2017-12-28 14:08:50 -08:00
Junio C Hamano
594672d237 Merge branch 'ks/rebase-error-messages' 
Error messages from "git rebase" have been somewhat cleaned up.

* ks/rebase-error-messages:
  rebase: rebasing can also be done when HEAD is detached
  rebase: distinguish user input by quoting it
  rebase: consistently use branch_name variable
 2017-12-28 14:08:49 -08:00
Junio C Hamano
593fdcc06a Merge branch 'sr/http-sslverify-config-doc' 
Docfix.

* sr/http-sslverify-config-doc:
  config: document default value of http.sslVerify
 2017-12-28 14:08:49 -08:00
Junio C Hamano
9368a3d08e Merge branch 'nm/imap-send-quote-server-folder-name' 
"git imap-send" did not correctly quote the folder name when
making a request to the server, which has been corrected.

* nm/imap-send-quote-server-folder-name:
  imap-send: URI encode server folder
 2017-12-28 14:08:48 -08:00
Junio C Hamano
8e777af273 Merge branch 'bp/fsmonitor' 
Test fix.

* bp/fsmonitor:
  p7519: improve check for prerequisite WATCHMAN
 2017-12-28 14:08:48 -08:00
Junio C Hamano
f40e83d685 Merge branch 'jh/partial-clone-doc' 
* jh/partial-clone-doc:
  partial-clone: design doc
 2017-12-28 14:08:47 -08:00
Junio C Hamano
2546de27c3 Merge branch 'jt/transport-hide-vtable' 
Code clean-up.

* jt/transport-hide-vtable:
  transport: make transport vtable more private
  clone, fetch: remove redundant transport check
 2017-12-28 14:08:47 -08:00