aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'cn/deprecate-ssh-git-url'Junio C Hamano2016-03-16
|\ | | | | | | | | | | | | | | | | The two alternative ways to spell "ssh://" transport have been deprecated for a long time. The last mention of them has finally removed from the documentation. * cn/deprecate-ssh-git-url: Disown ssh+git and git+ssh
| * Disown ssh+git and git+sshCarlos Martín Nieto2016-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some people argue that these were silly from the beginning (see http://thread.gmane.org/gmane.comp.version-control.git/285590/focus=285601 for example), but we have to support them for compatibility. That doesn't mean we have to show them in the documentation. These were already left out of the main list, but a reference in the main manpage was left, so remove that. Also add a note to discourage their use if anybody goes looking for them in the source code. Signed-off-by: Carlos Martín Nieto <cmn@dwim.me> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | RelNotes for 2.8.0: typofixJunio C Hamano2016-03-15
| | | | | | | | | | Helped-by: Max Horn Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'svn-glob' of git://bogomips.org/git-svnJunio C Hamano2016-03-15
|\ \ | | | | | | | | | | | | | | | * 'svn-glob' of git://bogomips.org/git-svn: git-svn: shorten glob error message git-svn: loosen config globs limitations
| * | git-svn: shorten glob error messageEric Wong2016-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Error messages should attempt to fit within the confines of an 80-column terminal to avoid compatibility and accessibility problems. Furthermore the word "directories" can be misleading when used in the context of git refnames. Signed-off-by: Eric Wong <normalperson@yhbt.net>
| * | git-svn: loosen config globs limitationsVictor Leschuk2016-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand the area of globs applicability for branches and tags in git-svn. It is now possible to use globs like 'a*e', or 'release_*'. This allows users to avoid long lines in config like: branches = branches/{release_20,release_21,release_22,...} In favor of: branches = branches/release_* [ew: amended commit message, minor formatting and style fixes] Signed-off-by: Victor Leschuk <vleschuk@accesssoftek.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
* | | Merge tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2016-03-15
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n-2.8.0-rnd2 * tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-po: (22 commits) l10n: zh_CN: for git v2.8.0 l10n round 3 l10n: git.pot: Add one new message for Git 2.8.0 l10n: zh_CN: for git v2.8.0 l10n round 2 l10n: fr.po v2.8.0 round 2 l10n: ru.po: update Russian translation l10n: ko: Update Korean translation l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed) l10n: zh_CN: for git v2.8.0 l10n round 1 l10n: de.po: translate 48 new messages l10n: de.po: translate "command" as "Befehl" l10n: de.po: fix interactive rebase message l10n: de.po: add space to abbreviation "z. B." l10n: de.po: fix typo l10n: TEAMS: update Ralf Thielow's email address l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter" l10n: ko.po: Update Korean translation l10n: ru.po: update Russian translation l10n: vi.po (2509t): Updated Vietnamese translation l10n: fr.po v2.8.0 round 1 2509t ...
| * | l10n: zh_CN: for git v2.8.0 l10n round 3Jiang Xin2016-03-16
| | | | | | | | | | | | | | | | | | Update 1 new translations (2530t0f0u) for git v2.8.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | l10n: git.pot: Add one new message for Git 2.8.0Jiang Xin2016-03-16
| | | | | | | | | | | | | | | | | | | | | | | | Add one new message came from this commit: * df22724 wt-status: allow "ahead " to be picked up by l10n Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-03-16
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.8.0 l10n round 2 l10n: fr.po v2.8.0 round 2 l10n: ru.po: update Russian translation l10n: ko: Update Korean translation l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed) l10n: zh_CN: for git v2.8.0 l10n round 1 l10n: de.po: translate 48 new messages l10n: de.po: translate "command" as "Befehl" l10n: de.po: fix interactive rebase message l10n: de.po: add space to abbreviation "z. B." l10n: de.po: fix typo l10n: TEAMS: update Ralf Thielow's email address l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter" l10n: ko.po: Update Korean translation l10n: ru.po: update Russian translation l10n: vi.po (2509t): Updated Vietnamese translation l10n: fr.po v2.8.0 round 1 2509t l10n: fr.po: Correct case in sentence l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)
| * | l10n: zh_CN: for git v2.8.0 l10n round 2Jiang Xin2016-03-16
| | | | | | | | | | | | | | | | | | Update 21 new translations (2529t0f0u) for git v2.8.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | l10n: fr.po v2.8.0 round 2Jean-Noel Avila2016-03-14
| | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| * | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-03-13
| |\ \ | | | | | | | | | | | | | | | | * 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation
| | * | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-03-13
| | | | | | | | | | | | | | | | Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
| * | | l10n: ko: Update Korean translationChangwoo Ryu2016-03-13
| |/ / | | | | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| * | l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)Jiang Xin2016-03-12
| | | | | | | | | | | | | | | | | | Generate po/git.pot from v2.8.0-rc2 for git v2.8.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-03-12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.8.0 l10n round 1 l10n: de.po: translate 48 new messages l10n: de.po: translate "command" as "Befehl" l10n: de.po: fix interactive rebase message l10n: de.po: add space to abbreviation "z. B." l10n: de.po: fix typo l10n: TEAMS: update Ralf Thielow's email address l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter" l10n: ko.po: Update Korean translation l10n: ru.po: update Russian translation l10n: vi.po (2509t): Updated Vietnamese translation l10n: fr.po v2.8.0 round 1 2509t l10n: fr.po: Correct case in sentence l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)
| | * | l10n: zh_CN: for git v2.8.0 l10n round 1Jiang Xin2016-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 48 new translations (2509t0f0u) for git v2.8.0-rc0. Reviewed-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> l10n: zh_CN: review for git v2.8.0 l10n round 1
| | * | l10n: de.po: translate 48 new messagesRalf Thielow2016-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate 48 new messages came from git.pot update in 9eb3984 (l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
| | * | l10n: de.po: translate "command" as "Befehl"Ralf Thielow2016-03-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>
| | * | l10n: de.po: fix interactive rebase messageRalf Thielow2016-03-05
| | | | | | | | | | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| | * | l10n: de.po: add space to abbreviation "z. B."Ralf Thielow2016-03-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>
| | * | l10n: de.po: fix typoChristoph Hoopmann2016-03-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Hoopmann <christophhoopmann@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| | * | l10n: TEAMS: update Ralf Thielow's email addressRalf Thielow2016-03-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | * | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2016-03-05
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter"
| | | * | l10n: sv.po: Update Swedish translation (2509t0f0u)Peter Krefting2016-03-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| | | * | l10n: sv.po: Fix inconsistent translation of "progress meter"Peter Krefting2016-03-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| | * | | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin2016-03-05
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation
| | | * | | l10n: ko.po: Update Korean translationChangwoo Ryu2016-03-03
| | | |/ / | | | | | | | | | | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| | * | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-03-02
| | |/ / | | | | | | | | | | | | Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
| | * | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2016-02-29
| | |\ \ | | | | | | | | | | | | | | | | | | | | * 'master' of https://github.com/vnwildman/git: l10n: vi.po (2509t): Updated Vietnamese translation
| | | * | l10n: vi.po (2509t): Updated Vietnamese translationTran Ngoc Quan2016-02-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
| | * | | l10n: fr.po v2.8.0 round 1 2509tJean-Noel Avila2016-02-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| | * | | l10n: fr.po: Correct case in sentenceAudric Schiltknecht2016-02-28
| | |/ / | | | | | | | | | | | | Signed-off-by: Audric Schiltknecht <storm@chemicalstorm.org>
| | * | l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)Jiang Xin2016-02-28
| | | | | | | | | | | | | | | | | | | | | | | | Generate po/git.pot from v2.8.0-rc0 for git v2.8.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* | | | Merge branch 'mg/wt-status-mismarked-i18n'Junio C Hamano2016-03-14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * mg/wt-status-mismarked-i18n: wt-status: allow "ahead " to be picked up by l10n
| * | | wt-status: allow "ahead " to be picked up by l10nMichael J Gruber2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extra pair of parentheses keeps the l10n engine from picking up the string. Remove them so that "ahead " ends up in git.pot. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Git 2.8-rc2v2.8.0-rc2Junio C Hamano2016-03-10
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Sync with 2.7.3Junio C Hamano2016-03-10
|\ \ \ \
| * | | | Git 2.7.3v2.7.3Junio C Hamano2016-03-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Merge branch 'ma/update-hooks-sample-typofix' into maintJunio C Hamano2016-03-10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ma/update-hooks-sample-typofix: templates/hooks: fix minor typo in the sample update-hook
| * \ \ \ \ Merge branch 'dt/initial-ref-xn-commit-doc' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dt/initial-ref-xn-commit-doc: refs: document transaction semantics
| * \ \ \ \ \ Merge branch 'ps/plug-xdl-merge-leak' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ps/plug-xdl-merge-leak: xdiff/xmerge: fix memory leak in xdl_merge
| * \ \ \ \ \ \ Merge branch 'ak/git-strip-extension-from-dashed-command' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code simplification. * ak/git-strip-extension-from-dashed-command: git.c: simplify stripping extension of a file in handle_builtin()
| * \ \ \ \ \ \ \ Merge branch 'ak/extract-argv0-last-dir-sep' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code simplification. * ak/extract-argv0-last-dir-sep: exec_cmd.c: use find_last_dir_sep() for code simplification
| * \ \ \ \ \ \ \ \ Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to read the pack data using the offsets stored in the pack idx file has been made more carefully check the validity of the data in the idx. * jk/pack-idx-corruption-safety: sha1_file.c: mark strings for translation use_pack: handle signed off_t overflow nth_packed_object_offset: bounds-check extended offset t5313: test bounds-checks of corrupted/malicious pack/idx files
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git config section.var value" to set a value in per-repository configuration file failed when it was run outside any repository, but didn't say the reason correctly. * js/config-set-in-non-repository: git config: report when trying to modify a non-existing repo config
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A helper function "git submodule" uses since v2.7.0 to list the modules that match the pathspec argument given to its subcommands (e.g. "submodule add <repo> <path>") has been fixed. * sb/submodule-module-list-fix: submodule helper list: respect correct path prefix
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-binary-workaround-in-test' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent versions of GNU grep are pickier when their input contains arbitrary binary data, which some of our tests uses. Rewrite the tests to sidestep the problem. * jk/grep-binary-workaround-in-test: t9200: avoid grep on non-ASCII data t8005: avoid grep on non-ASCII data
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/push-simple-doc' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation did not clearly state that the 'simple' mode is now the default for "git push" when push.default configuration is not set. * mm/push-simple-doc: Documentation/git-push: document that 'simple' is the default
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-01 07:45:11 +0000