Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-07scripts: use "git foo" not "git-foo"Michael Forney
We want to make sure that people who copy & paste code would see fewer instances of "git-foo". The use of these dashed forms have been discouraged since v1.6.0 days. Signed-off-by: Michael Forney <mforney@mforney.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-04Git 2.14v2.14.0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-04Merge branch 'ah/patch-id-doc'Junio C Hamano
Docfix. * ah/patch-id-doc: doc: remove unsupported parameter from patch-id
2017-08-04Merge branch 'as/diff-options-grammofix'Junio C Hamano
A grammofix. * as/diff-options-grammofix: diff-options doc: grammar fix
2017-08-02Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano
l10n for Git 2.14.0 round 2 * tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po: l10n: zh_CN: review for git v2.14.0 l10n l10n: ko.po: Update Korean translation l10n: zh_CN: for git v2.14.0 l10n round 2 l10n: de.po: various fixes in German translation l10n: ru.po: update Russian translation l10n: fr.po v2.14.0 rnd 2 l10n: fr.po Fix some french typos l10n: fr.po Fix typo l10n: fr.po Fix some translations l10n: de.po: update German translation l10n: vi.po (3213t): Updated 9 new strings l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3213t)
2017-08-02l10n: zh_CN: review for git v2.14.0 l10nJiang Xin
Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-08-01Sync with v2.13.4Junio C Hamano
2017-08-01Git 2.13.4v2.13.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-01l10n: ko.po: Update Korean translationChangwoo Ryu
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2017-08-01l10n: zh_CN: for git v2.14.0 l10n round 2Jiang Xin
Translate new l10n messages for git 2.14.0, and update translations on "stash". Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-07-31Sync with maintJunio C Hamano
* maint: Preparation for 2.13.4 continues
2017-07-31Preparation for 2.13.4 continuesJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-31Merge branch 'ks/doc-fixes' into maintJunio C Hamano
Doc clean-up. * ks/doc-fixes: doc: reformat the paragraph containing the 'cut-line' doc: camelCase the i18n config variables to improve readability
2017-07-31Merge branch 'jk/test-copy-bytes-fix' into maintJunio C Hamano
A test fix. * jk/test-copy-bytes-fix: t: handle EOF in test_copy_bytes()
2017-07-31Merge branch 'pw/unquote-path-in-git-pm' into maintJunio C Hamano
Code refactoring. * pw/unquote-path-in-git-pm: t9700: add tests for Git::unquote_path() Git::unquote_path(): throw an exception on bad path Git::unquote_path(): handle '\a' add -i: move unquote_path() to Git.pm
2017-07-31Merge branch 'jk/gc-pre-detach-under-hook' into maintJunio C Hamano
We run an early part of "git gc" that deals with refs before daemonising (and not under lock) even when running a background auto-gc, which caused multiple gc processes attempting to run the early part at the same time. This is now prevented by running the early part also under the GC lock. * jk/gc-pre-detach-under-hook: gc: run pre-detach operations under lock
2017-07-31Merge branch 'jn/hooks-pre-rebase-sample-fix' into maintJunio C Hamano
Code clean-up, that makes us in sync with Debian by one patch. * jn/hooks-pre-rebase-sample-fix: pre-rebase hook: capture documentation in a <<here document
2017-07-31Merge branch 'rs/progress-overall-throughput-at-the-end' into maintJunio C Hamano
The progress meter did not give a useful output when we haven't had 0.5 seconds to measure the throughput during the interval. Instead show the overall throughput rate at the end, which is a much more useful number. * rs/progress-overall-throughput-at-the-end: progress: show overall rate in last update
2017-07-31Merge branch 'tb/push-to-cygwin-unc-path' into maintJunio C Hamano
On Cygwin, similar to Windows, "git push //server/share/repository" ought to mean a repository on a network share that can be accessed locally, but this did not work correctly due to stripping the double slashes at the beginning. This may need to be heavily tested before it gets unleashed to the wild, as the change is at a fairly low-level code and would affect not just the code to decide if the push destination is local. There may be unexpected fallouts in the path normalization. * tb/push-to-cygwin-unc-path: cygwin: allow pushing to UNC paths
2017-07-31Merge branch 'rs/apply-avoid-over-reading' into maintJunio C Hamano
Code cleanup. * rs/apply-avoid-over-reading: apply: use strcmp(3) for comparing strings in gitdiff_verify_name() apply: use starts_with() in gitdiff_verify_name()
2017-07-31Merge branch 'js/blame-lib'Junio C Hamano
A hotfix to a topic already in 'master'. * js/blame-lib: blame: fix memory corruption scrambling revision name in error message
2017-07-31diff-options doc: grammar fixAnthony Sottile
Signed-off-by: Anthony Sottile <asottile@umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-30l10n: de.po: various fixes in German translationHartmut Henkel
Signed-off-by: Hartmut Henkel <henkel@vh-s.de> Helped-by: Stefan Beller <sbeller@google.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2017-07-30Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin
* 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation
2017-07-30l10n: ru.po: update Russian translationDimitriy Ryazantcev
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2017-07-29doc: remove unsupported parameter from patch-idAndreas Heiduk
The patch is read from standard input and not from a parameter. Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-27Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin
* 'master' of https://github.com/ralfth/git-po-de: l10n: de.po: update German translation
2017-07-27Merge branch 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/gitJiang Xin
* 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/git: l10n: fr.po v2.14.0 rnd 2 l10n: fr.po Fix some french typos l10n: fr.po Fix typo l10n: fr.po Fix some translations
2017-07-27l10n: fr.po v2.14.0 rnd 2Jean-Noel Avila
Signed-off-by: Jean-Noel Avila <jean-noel.avila@scantech.fr>
2017-07-27l10n: fr.po Fix some french typosSylvestre Ledru
Signed-off-by: Sylvestre Ledru <sylvestre@debian.org>
2017-07-27l10n: fr.po Fix typoLouis
Signed-off-by: Louis <spalax@gresille.org>
2017-07-27l10n: fr.po Fix some translationsHugues Peccatte
Signed-off-by: Hugues Peccatte <hugues.peccatte@aareon.fr> Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2017-07-26l10n: de.po: update German translationRalf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2017-07-25Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin
* 'master' of https://github.com/Softcatala/git-po: l10n: Update Catalan translation
2017-07-25Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin
* 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (3213t)
2017-07-25l10n: vi.po (3213t): Updated 9 new stringsTran Ngoc Quan
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-07-25Git 2.14-rc1v2.14.0-rc1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-25blame: fix memory corruption scrambling revision name in error messageSZEDER Gábor
When attempting to blame a non-existing path, git should show an error message like this: $ git blame e83c51633 -- nonexisting-file fatal: no such path nonexisting-file in e83c51633 Since the recent commit 835c49f7d (blame: rework methods that determine 'final' commit, 2017-05-24) the revision name is either missing or some scrambled characters are shown instead. The reason is that the revision name must be duplicated, because it is invalidated when the pending objects array is cleared in the meantime, but this commit dropped the duplication. Restore the duplication of the revision name in the affected functions (find_single_final() and find_single_initial()). Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-25Merge https://github.com/git-l10n/git-poJunio C Hamano
* https://github.com/git-l10n/git-po: l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed) l10n: sv.po: Update Swedish translation (3206t0f0u) l10n: ko.po: Update Korean translation l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3206t) l10n: vi.po(3206t): Update Vietnamese translation l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed) l10n: ru.po: update Russian translation l10n: Fixes to Catalan translation
2017-07-24l10n: Update Catalan translationJordi Mas
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-07-24l10n: bg.po: Updated Bulgarian translation (3213t)Alexander Shopov
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2017-07-24l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed)Jiang Xin
Generate po/git.pot from v2.14.0-rc0-40-g5eada8987e for git v2.14.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-07-24Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin
* 'master' of git://github.com/git-l10n/git-po: l10n: sv.po: Update Swedish translation (3206t0f0u) l10n: ko.po: Update Korean translation l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3206t) l10n: vi.po(3206t): Update Vietnamese translation l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed) l10n: ru.po: update Russian translation l10n: Fixes to Catalan translation
2017-07-22Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin
* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3206t0f0u)
2017-07-22Sync with maintJunio C Hamano
* maint: fixes from 'master' for 2.13.4
2017-07-22fixes from 'master' for 2.13.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-22Merge branch 'ew/fd-cloexec-fix' into maintJunio C Hamano
Portability/fallback fix. * ew/fd-cloexec-fix: set FD_CLOEXEC properly when O_CLOEXEC is not supported
2017-07-22Merge branch 'ks/fix-rebase-doc-picture' into maintJunio C Hamano
Doc update. * ks/fix-rebase-doc-picture: doc: correct a mistake in an illustration
2017-07-22Merge branch 'js/alias-case-sensitivity' into maintJunio C Hamano
A recent update broke an alias that contained an uppercase letter. * js/alias-case-sensitivity: alias: compare alias name *case-insensitively* t1300: demonstrate that CamelCased aliases regressed
2017-07-22Merge branch 'bb/unicode-10.0' into maintJunio C Hamano
Update the character width tables. * bb/unicode-10.0: unicode: update the width tables to Unicode 10
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-06 00:30:04 +0300