summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-01-09Merge branch 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-koLibravatar Jiang Xin2-1944/+2200
* 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-ko: l10n: ko.po: Update Korean translation
2018-01-08l10n: ko.po: Update Korean translationLibravatar Changwoo Ryu2-1944/+2200
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-08Merge branch '2.16' of https://github.com/ChrisADR/git-poLibravatar Jiang Xin1-181/+197
* '2.16' of https://github.com/ChrisADR/git-po: l10n: es.po: Spanish translation 2.16.0 round 2
2018-01-08Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/gitLibravatar Jiang Xin1-192/+225
* 'fr_2.16-rc1' of git://github.com/jnavila/git: l10n: fr.po 2.16 round 2
2018-01-07l10n: fr.po 2.16 round 2Libravatar Jean-Noel Avila1-192/+225
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2018-01-07l10n: es.po: Spanish translation 2.16.0 round 2Libravatar Christopher Díaz Riveros1-181/+197
Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
2018-01-07l10n: vi.po(3288t): Updated Vietnamese translation for v2.16.0 round 2Libravatar Tran Ngoc Quan1-1929/+2156
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2018-01-07l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed)Libravatar Jiang Xin1-173/+192
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-07Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin8-10292/+11238
* '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-06Merge branch '2.16' of https://github.com/ChrisADR/git-poLibravatar Jiang Xin1-1920/+2129
* '2.16' of https://github.com/ChrisADR/git-po: l10n: es.po: Update Spanish Translation v2.16.0
2018-01-06Merge branch 'fr_2.16' of git://github.com/jnavila/gitLibravatar Jiang Xin1-1911/+2113
* '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-05Git 2.16-rc1Libravatar Junio C Hamano2-1/+12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-01-05Merge branch 'js/sequencer-cleanups'Libravatar Junio C Hamano2-13/+20
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-05Merge branch 'jh/memihash-opt'Libravatar Junio C Hamano1-1/+1
Squelch compiler warning. * jh/memihash-opt: t/helper/test-lazy-name-hash: fix compilation
2018-01-05Merge branch 'tb/test-lint-wc-l'Libravatar Junio C Hamano1-0/+1
Test update. * tb/test-lint-wc-l: check-non-portable-shell.pl: `wc -l` may have leading WS
2018-01-05Merge branch 'rs/use-argv-array-in-child-process'Libravatar Junio C Hamano2-27/+12
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-05Merge branch 'ld/p4-multiple-shelves'Libravatar Junio C Hamano3-26/+47
"git p4" update. * ld/p4-multiple-shelves: git-p4: update multiple shelved change lists
2018-01-05Merge branch 'jd/fix-strbuf-add-urlencode-bytes'Libravatar Junio C Hamano1-1/+1
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-05Merge branch 'ew/empty-merge-with-dirty-index'Libravatar Junio C Hamano5-42/+70
"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-05Merge branch 'db/doc-config-section-names-with-bs'Libravatar Junio C Hamano1-5/+7
Doc update. * db/doc-config-section-names-with-bs: config.txt: document behavior of backslashes in subsections
2018-01-05Merge branch 'jk/test-suite-tracing'Libravatar Junio C Hamano4-18/+48
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-04l10n: es.po: Update Spanish Translation v2.16.0Libravatar Christopher Díaz Riveros1-1920/+2129
Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
2018-01-02l10n: fr.po v2.16.0 round 1Libravatar Jean-Noel Avila1-1910/+2112
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2018-01-02Merge branch 'master' of git://github.com/alshopov/git-poLibravatar Jiang Xin1-1934/+2106
* 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (3284t)
2018-01-01l10n: bg.po: Updated Bulgarian translation (3284t)Libravatar Alexander Shopov1-1934/+2106
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2018-01-01l10n: sv.po: Update Swedish translation (3284t0f0u)Libravatar Peter Krefting1-1910/+2118
Also corrected spelling. Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2017-12-31l10n: fr.po: "worktree list" mistranslated as pruneLibravatar Louis Bettens1-1/+1
Signed-off-by: Louis Bettens <louis@bettens.info>
2017-12-31Merge branch 'maint' of git://github.com/git-l10n/git-poLibravatar Jiang Xin4-745/+746
* '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-31l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed)Libravatar Jiang Xin1-1885/+2039
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-28Git 2.16-rc0Libravatar Junio C Hamano2-1/+32
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-12-28Merge branch 'sb/describe-blob'Libravatar Junio C Hamano8-52/+277
"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-28Merge branch 'hi/merge-verify-sig-config'Libravatar Junio C Hamano4-0/+132
"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-28Merge branch 'ws/curl-http-proxy-over-https'Libravatar Junio C Hamano1-0/+5
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-28Merge branch 'ks/doc-previous-checkout'Libravatar Junio C Hamano1-7/+12
Doc update. * ks/doc-previous-checkout: Doc/check-ref-format: clarify information about @{-N} syntax
2017-12-28Merge branch 'ks/rebase-error-messages'Libravatar Junio C Hamano1-10/+25
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-28Merge branch 'sr/http-sslverify-config-doc'Libravatar Junio C Hamano1-2/+2
Docfix. * sr/http-sslverify-config-doc: config: document default value of http.sslVerify
2017-12-28Merge branch 'nm/imap-send-quote-server-folder-name'Libravatar Junio C Hamano1-1/+7
"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-28Merge branch 'bp/fsmonitor'Libravatar Junio C Hamano1-2/+1
Test fix. * bp/fsmonitor: p7519: improve check for prerequisite WATCHMAN
2017-12-28Merge branch 'jh/partial-clone-doc'Libravatar Junio C Hamano1-0/+324
* jh/partial-clone-doc: partial-clone: design doc
2017-12-28Merge branch 'jt/transport-hide-vtable'Libravatar Junio C Hamano6-93/+120
Code clean-up. * jt/transport-hide-vtable: transport: make transport vtable more private clone, fetch: remove redundant transport check
2017-12-28Merge branch 'js/enhanced-version-info'Libravatar Junio C Hamano4-1/+20
"git version --build-options" learned to report the host CPU and the exact commit object name the binary was built from. * js/enhanced-version-info: version --build-options: report commit, too, if possible version --build-options: also report host CPU
2017-12-28Merge branch 'tz/lib-git-svn-svnserve-tests'Libravatar Junio C Hamano1-11/+13
* tz/lib-git-svn-svnserve-tests: t/lib-git-svn.sh: improve svnserve tests with parallel make test t/lib-git-svn: cleanup inconsistent tab/space usage
2017-12-28Merge branch 'ew/svn-crlf'Libravatar Junio C Hamano2-0/+28
"git svn" has been updated to strip CRs in the commit messages, as recent versions of Subversion rejects them. * ew/svn-crlf: git-svn: convert CRLF to LF in commit message to SVN
2017-12-28Merge branch 'cc/skip-to-optional-val'Libravatar Junio C Hamano5-90/+126
Introduce a helper to simplify code to parse a common pattern that expects either "--key" or "--key=<something>". * cc/skip-to-optional-val: t4045: reindent to make helpers readable diff: add tests for --relative without optional prefix value diff: use skip_to_optional_arg_default() in parsing --relative diff: use skip_to_optional_arg_default() diff: use skip_to_optional_arg() index-pack: use skip_to_optional_arg() git-compat-util: introduce skip_to_optional_arg()
2017-12-28Merge branch 'ra/prompt-eread-fix'Libravatar Junio C Hamano1-3/+4
Update the shell prompt script (in contrib/) to strip trailing CR from strings read from various "state" files. * ra/prompt-eread-fix: git-prompt: fix reading files with windows line endings git-prompt: make __git_eread intended use explicit
2017-12-28Merge branch 'bw/path-doc'Libravatar Junio C Hamano1-21/+112
Doc updates. * bw/path-doc: path: document path functions
2017-12-27sequencer: do not invent whitespace when transforming OIDsLibravatar Johannes Schindelin1-1/+4
For commands that do not have an argument, there is no need to append a trailing space at the end of the line. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-12-27sequencer: report when noop has an argumentLibravatar Johannes Schindelin1-4/+9
The noop command cannot accept any argument, but we never told the user about any bogus argument. Fix that. while at it, mention clearly when an argument is required but missing (for commands *other* than noop). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-12-27sequencer: remove superfluous conditionalLibravatar Johannes Schindelin1-3/+1
In a conditional block that is only reached when handling a TODO_REWORD (as seen even from a 3-line context), there is absolutely no need to nest another block under the identical condition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-12-27sequencer: strip bogus LF at end of error messagesLibravatar Johannes Schindelin1-4/+4
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 04:04:29 +0000