Permalink
Commits on Aug 7, 2012
  1. Git 1.7.12-rc2

    gitster committed Aug 7, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 6, 2012
  1. Drop 1.7.11.x items from 1.7.12 release notes

    gitster committed Aug 6, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Sync with maint

    gitster committed Aug 6, 2012
  3. Prepare for 1.7.11.5

    gitster committed Aug 6, 2012
    Hopefully that will be the final 1.7.11.x maintenance release.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'jn/block-sha1' into maint

    gitster committed Aug 6, 2012
    * 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
  5. Merge branch 'jn/make-assembly-in-right-directory' into maint

    gitster committed Aug 6, 2012
    * jn/make-assembly-in-right-directory:
      Makefile: fix location of listing produced by "make subdir/foo.s"
  6. Merge branch 'ms/daemon-doc-typo' into maint

    gitster committed Aug 6, 2012
    * ms/daemon-doc-typo:
      Documentation/git-daemon: add missing word
  7. Merge branch 'lm/git-blame-el' into maint

    gitster committed Aug 6, 2012
    * 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
  8. Merge branch 'rs/ipv6-ssh-url' into maint

    gitster committed Aug 6, 2012
    * rs/ipv6-ssh-url:
      git: Wrong parsing of ssh urls with IPv6 literals ignores port
  9. Merge branch 'rs/git-blame-mapcar-mapc' into maint

    gitster committed Aug 6, 2012
    * rs/git-blame-mapcar-mapc:
      git-blame.el: use mapc instead of mapcar
  10. Merge branch 'rr/doc-commit' into maint

    gitster committed Aug 6, 2012
    * rr/doc-commit:
      commit: document a couple of options
  11. doc: A few minor copy edits.

    stepnem committed with gitster Jul 14, 2012
    - (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>
  12. Merge branch 'jk/maint-checkout-orphan-check-fix' into maint

    gitster committed Aug 6, 2012
    * jk/maint-checkout-orphan-check-fix:
      checkout: don't confuse ref and object flags
  13. Merge branch 'mh/maint-revisions-doc' into maint

    gitster committed Aug 6, 2012
    * mh/maint-revisions-doc:
      Enumerate revision range specifiers in the documentation
      Make <refname> documentation more consistent.
  14. Merge branch 'jc/mergetool-tool-help' into maint

    gitster committed Aug 6, 2012
    * jc/mergetool-tool-help:
      mergetool: support --tool-help option like difftool does
  15. Makefile: use overridable $(FIND) instead of hard-coded 'find'

    j6t committed with gitster Aug 6, 2012
    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>
  16. Merge git://github.com/git-l10n/git-po

    gitster committed Aug 6, 2012
    * 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)
Commits on Aug 5, 2012
  1. merge-recursive: separate message for common ancestors

    ralfth committed with gitster Aug 5, 2012
    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>
Commits on Aug 4, 2012
  1. l10n: zh_CN.po: translate 76 new messages

    jiangxin committed Aug 2, 2012
    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>
Commits on Aug 3, 2012
  1. git-remote-mediawiki: replace TODO-list in comment by appropriate link

    moy committed with gitster Aug 3, 2012
    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>
  2. l10n: vi.po update to follow POT in 3b613

    vnwildman committed Aug 3, 2012
    * Translated 76 new messages
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Commits on Aug 2, 2012
  1. l10n: Update git.pot (76 new, 4 removed messages)

    jiangxin committed Aug 2, 2012
    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>
Commits on Aug 1, 2012
  1. Merge git://github.com/git-l10n/git-po

    gitster committed Aug 1, 2012
    * 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)
  2. git-rebase.sh: fix typo in an error message

    ralfth committed with gitster Aug 1, 2012
    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>
Commits on Jul 31, 2012
  1. Merge branch 'nd/maint-i18n-diffstat'

    gitster committed Jul 31, 2012
    * nd/maint-i18n-diffstat:
      i18n: leave \n out of translated diffstat
  2. Merge branch 'jx/i18n-1.7.11'

    gitster committed Jul 31, 2012
    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
      i18n: rebase: mark messages for translation
      i18n: New keywords for xgettext extraction from sh
  3. l10n: de.po: translate 4 new messages

    ralfth committed Jul 30, 2012
    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>
  4. l10n: vi.po: translate 4 new messages

    vnwildman committed Jul 31, 2012
    Update Vietnamse translation to POT file in 0bbe5b4
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Commits on Jul 30, 2012
  1. l10n: zh_CN.po: translate 4 new messages

    jiangxin committed Jul 30, 2012
    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>
  2. Git 1.7.12-rc1

    gitster committed Jul 30, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Sync with 1.7.11.4

    gitster committed Jul 30, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Git 1.7.11.4

    gitster committed Jul 30, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Merge branch 'jk/maint-commit-document-editmsg' into maint

    gitster committed Jul 30, 2012
    "$GIT_DIR/COMMIT_EDITMSG" file that is used to hold the commit log
    message user edits was not documented.
    
    * jk/maint-commit-document-editmsg:
      commit: document the temporary commit message file
  6. Merge branch 'jk/maint-advise-vaddf' into maint

    gitster committed Jul 30, 2012
    The advise() function did not use varargs correctly to format
    its message.
    
    * jk/maint-advise-vaddf:
      advice: pass varargs to strbuf_vaddf, not strbuf_addf
  7. Merge branch 'kk/maint-commit-tree' into maint

    gitster committed Jul 30, 2012
    "git commit-tree" learned a more natural "-p <parent> <tree>" order
    of arguments long time ago, but recently forgot it by mistake.
    
    * kk/maint-commit-tree:
      Revert "git-commit-tree(1): update synopsis"
      commit-tree: resurrect command line parsing updates