Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.12-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.12-rc2
Junio C Hamano
Drop 1.7.11.x items from 1.7.12 release notes Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with maint
Junio C Hamano
Prepare for 1.7.11.5 Hopefully that will be the final 1.7.11.x maintenance release. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jn/block-sha1' into maint * jn/block-sha1: Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads block-sha1: put expanded macro parameters in parentheses block-sha1: avoid pointer conversion that violates alignment constraints
Junio C Hamano
Merge branch 'jn/make-assembly-in-right-directory' into maint * jn/make-assembly-in-right-directory: Makefile: fix location of listing produced by "make subdir/foo.s"
Junio C Hamano
Merge branch 'ms/daemon-doc-typo' into maint * ms/daemon-doc-typo: Documentation/git-daemon: add missing word
Junio C Hamano
Merge branch 'lm/git-blame-el' into maint * lm/git-blame-el: git-blame.el: Do not use bare 0 to mean (point-min) git-blame.el: Use with-current-buffer where appropriate git-blame.el: Do not use goto-line in lisp code
Junio C Hamano
Merge branch 'rs/ipv6-ssh-url' into maint * rs/ipv6-ssh-url: git: Wrong parsing of ssh urls with IPv6 literals ignores port
Junio C Hamano
Merge branch 'rs/git-blame-mapcar-mapc' into maint * rs/git-blame-mapcar-mapc: git-blame.el: use mapc instead of mapcar
Junio C Hamano
Merge branch 'rr/doc-commit' into maint * rr/doc-commit: commit: document a couple of options
stepnem
doc: A few minor copy edits. - (glossary) the quotes around the Wikipedia URL prevented its linkification in frontends that support it; remove them - (manual) newer version (SHA-1) == following, older == preceding, not the other way around - trivial typo and wording fixes Signed-off-by: Štěpán Němec <stepnem@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/maint-checkout-orphan-check-fix' into maint * jk/maint-checkout-orphan-check-fix: checkout: don't confuse ref and object flags
Junio C Hamano
Merge branch 'mh/maint-revisions-doc' into maint * mh/maint-revisions-doc: Enumerate revision range specifiers in the documentation Make <refname> documentation more consistent.
Junio C Hamano
Merge branch 'jc/mergetool-tool-help' into maint * jc/mergetool-tool-help: mergetool: support --tool-help option like difftool does
Johannes Sixt
Makefile: use overridable $(FIND) instead of hard-coded 'find' The Makefile already offers the variable $(FIND) and uses it except in one place. Fix it. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: zh_CN.po: translate 76 new messages l10n: vi.po update to follow POT in 3b613 l10n: Update git.pot (76 new, 4 removed messages)
Ralf Thielow
merge-recursive: separate message for common ancestors The function "merge_recursive" prints the count of common ancestors as "found %u common ancestor(s):". We should use a singular and a plural form of this message to help translators. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin
l10n: zh_CN.po: translate 76 new messages Translate 76 new messages came from git.pot update in 3b6137f (l10n: Update git.pot (76 new, 4 removed messages)) Thynson reviewed this update and also contributed other improvements: * blob -> 二进制对象(blob) * 共用 -> 同时使用 Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Thynson <lanxingcan@gmail.com>
Matthieu Moy
git-remote-mediawiki: replace TODO-list in comment by appropriate link My account on Github is now used as wiki and issue tracking. This will be more flexible than in-tree management of a TODO-list. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tran Ngoc Quan
l10n: vi.po update to follow POT in 3b613 * Translated 76 new messages Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Jiang Xin
l10n: Update git.pot (76 new, 4 removed messages) Generate po/git.pot from v1.7.12-rc1-16-g05a20, and there are 76 new, 4 removed l10n messages. * 76 new messages are added at lines: 230, 337-580, 4972, 4984, 4998, 5017, 5280-5378, 5654 * 4 old messages are deleted from the previous version at lines: 230, 4729, 4764, 5295 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Junio C Hamano
Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: de.po: translate 4 new messages l10n: vi.po: translate 4 new messages l10n: zh_CN.po: translate 4 new messages l10n: Update git.pot (4 new, 3 removed messages)
Ralf Thielow
git-rebase.sh: fix typo in an error message Fix a typo in the error messages which is shown if it seems that a rebase is already in progress. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'nd/maint-i18n-diffstat' * nd/maint-i18n-diffstat: i18n: leave \n out of translated diffstat
Junio C Hamano
Merge branch 'jx/i18n-1.7.11' Add i18n support for scripted Porcelains, and mark strings in merge(-recursive), am, and rebase for i18n. * jx/i18n-1.7.11: i18n: merge-recursive: mark strings for translation Remove dead code which contains bad gettext block i18n: am: mark more strings for translation rebase: remove obsolete and unused LONG_USAGE which breaks xgettext i18n: Rewrite gettext messages start with dash i1…
Ralf Thielow
l10n: de.po: translate 4 new messages Translate 4 new messages came from git.pot update in 0bbe5b4 (l10n: Update git.pot (4 new, 3 removed messages)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Tran Ngoc Quan
l10n: vi.po: translate 4 new messages Update Vietnamse translation to POT file in 0bbe5b4 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Jiang Xin
l10n: zh_CN.po: translate 4 new messages Translate 4 new messages came from git.pot update in 0bbe5b4 (l10n: Update git.pot (4 new, 3 removed messages)) Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Junio C Hamano
Git 1.7.12-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.12-rc1
  1. Prev
  2. Next