Permalink
Commits on May 15, 2012
  1. Merge branch 'maint' into master

    * maint:
      l10n: zh_CN.po: translate 3 new messages
    
    Conflicts:
    	po/zh_CN.po
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed May 15, 2012
  2. l10n: zh_CN.po: translate 3 new messages

    Translate 3 new messages for upcoming git 1.7.10.3.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed May 15, 2012
Commits on May 14, 2012
  1. Merge branch 'master' of git://github.com/marcomsousa/git-l10n-pt_PT

    By Marco Sousa
    * marcomsousa/git-l10n-pt_PT/master:
      l10n: pt_PT.po translate new messages
    jiangxin committed May 14, 2012
  2. l10n: pt_PT.po translate new messages

    Translate new and old messages came from git.pot.
    
    Signed-off-by: Marco Sousa <marcomsousa@gmail.com>
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    committed with jiangxin May 14, 2012
  3. l10n: Update git.pot (8 new, 4 removed messages)

    Generate po/git.pot from v1.7.10.2-520-g6a4a48:
    
     * 8 new l10n messages at lines:
    
       977, 982, 1404, 1409, 1414, 1419, 1424, 1429.
    
     * 4 removed l10n messages from lines:
    
       977, 1399, 1404, 1409.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed May 14, 2012
  4. Merge branch 'maint'

    * maint:
      l10n: Update git.pot (3 new, 2 removed messages)
    jiangxin committed May 14, 2012
  5. l10n: Update git.pot (3 new, 2 removed messages)

    Generate po/git.pot from v1.7.10.2-35-g0b9f4:
    
     * 3 new l10n messages at lines: 2743, 2751, 2759.
    
     * 2 removed l10n messages from lines: 1879, 2757.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed May 14, 2012
  6. Update draft release notes for 12th batch

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 14, 2012
  7. Merge branch 'fc/simplify-complete-revlist-file'

    By Felipe Contreras
    * fc/simplify-complete-revlist-file:
      completion: simplify __git_complete_revlist_file
    gitster committed May 14, 2012
  8. Merge branch 'nd/threaded-index-pack'

    Enables threading in index-pack to resolve base data in parallel.
    
    By Nguyễn Thái Ngọc Duy (3) and Ramsay Jones (1)
    * nd/threaded-index-pack:
      index-pack: disable threading if NO_PREAD is defined
      index-pack: support multithreaded delta resolving
      index-pack: restructure pack processing into three main functions
      compat/win32/pthread.h: Add an pthread_key_delete() implementation
    gitster committed May 14, 2012
  9. Sync with maint

    gitster committed May 14, 2012
  10. Merge branch 'master' of git://github.com/git-l10n/git-po

    By Ralf Thielow (6) and others
    via Jiang Xin (3) and Ralf Thielow (1)
    * 'master' of git://github.com/git-l10n/git-po:
      l10n: zh_CN.po: translate 1 new message
      l10n: de.po: translate one new message
      l10n: de.po: unify translation of "ahead" and "behind"
      l10n: de.po: collection of improvements
      l10n: de.po: translate "remote" as "extern"
      l10n: de.po: translate "track" as "beobachten"
      l10n: add new members to German translation team
      l10n: de.po: collection of suggestions
      l10n: de.po: translate "bad" as "ungültig" ("invalid")
      l10n: de.po: hopefully uncontroversial fixes
      l10n: de.po: translate "bare" as "bloß"
      l10n: Update git.pot (275 new, 15 removed messages)
      l10n: Update git.pot (1 new messages)
    gitster committed May 14, 2012
  11. Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

    By Ralf Thielow (6) and others
    via Jiang Xin
    * 'maint' of git://github.com/git-l10n/git-po:
      l10n: zh_CN.po: translate 1 new message
      l10n: de.po: translate one new message
      l10n: de.po: unify translation of "ahead" and "behind"
      l10n: de.po: collection of improvements
      l10n: de.po: translate "remote" as "extern"
      l10n: de.po: translate "track" as "beobachten"
      l10n: add new members to German translation team
      l10n: de.po: collection of suggestions
      l10n: de.po: translate "bad" as "ungültig" ("invalid")
      l10n: de.po: hopefully uncontroversial fixes
      l10n: de.po: translate "bare" as "bloß"
      l10n: Update git.pot (1 new messages)
    gitster committed May 14, 2012
  12. Start preparing for 1.7.10.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 14, 2012
  13. Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint

    Gives a better DWIM behaviour for --pretty=format:%gd, "stash list", and
    "log -g", depending on how the starting point ("master" vs "master@{0}" vs
    "master@{now}") and date formatting options (e.g. "--date=iso") are given
    on the command line.
    
    By Jeff King (4) and Junio C Hamano (1)
    * jk/maint-reflog-walk-count-vs-time:
      reflog-walk: tell explicit --date=default from not having --date at all
      reflog-walk: always make HEAD@{0} show indexed selectors
      reflog-walk: clean up "flag" field of commit_reflog struct
      log: respect date_mode_explicit with --format:%gd
      t1411: add more selector index/date tests
    gitster committed May 14, 2012
  14. Merge branch 'jk/doc-asciidoc-inline-literal' into maint

    By Jeff King
    * jk/doc-asciidoc-inline-literal:
      docs: stop using asciidoc no-inline-literal
    gitster committed May 14, 2012
  15. Merge branch 'ef/checkout-empty' into maint

    Running "git checkout" on an unborn branch used to corrupt HEAD
    (regression in 1.7.10); this makes it error out.
    
    By Erik Faye-Lund
    * ef/checkout-empty:
      checkout: do not corrupt HEAD on empty repo
    gitster committed May 14, 2012
  16. Merge branch 'jk/maint-tformat-with-z' into maint

    By Jan Krüger (1) and Junio C Hamano (1)
    * jk/maint-tformat-with-z:
      log-tree: the previous one is still not quite right
      log-tree: use custom line terminator in line termination mode
    gitster committed May 14, 2012
  17. Merge branch 'js/checkout-detach-count' into maint

    When checking out another commit from an already detached state, we used
    to report all commits that are not reachable from any of the refs as
    lossage, but some of them might be reachable from the new HEAD, and there
    is no need to warn about them.
    
    By Johannes Sixt
    * js/checkout-detach-count:
      checkout (detached): truncate list of orphaned commits at the new HEAD
      t2020-checkout-detach: check for the number of orphaned commits
    gitster committed May 14, 2012
  18. Merge branch 'ef/maint-clone-progress-fix' into maint

    Some time ago, "git clone" lost the progress output for its "checkout"
    phase; when run without any "--quiet" option, it should give progress to
    the lengthy operation.
    
    By Erik Faye-Lund
    * ef/maint-clone-progress-fix:
      clone: fix progress-regression
    gitster committed May 14, 2012
  19. link to gitmodules page at the beginning of git-submodule documentation

    This way the user does not have to scroll down to the bottom to find
    it.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Heiko Voigt committed with gitster May 14, 2012
  20. pack-protocol: fix first-want separator in the examples

    When sending the "want" list, the capabilities list is separated from
    the obj-id by a SP instead of NUL as in the ref advertisement. The
    text is correct, but the examples wrongly show the separator as
    NUL. Fix the example so it uses SP.
    
    Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    carlosmn committed with gitster May 11, 2012
Commits on May 12, 2012
  1. Merge branch 'maint'

    * maint:
      l10n: zh_CN.po: translate 1 new message
    
    Conflicts:
    	po/zh_CN.po
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed May 12, 2012
  2. l10n: zh_CN.po: translate 1 new message

    Translate new message '[new ref]' since git 1.7.10.1.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed May 8, 2012
Commits on May 11, 2012
  1. Update draft release notes to 1.7.11 (11th batch)

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 11, 2012
  2. Merge branch 'ef/checkout-empty'

    Running "git checkout" on an unborn branch used to corrupt HEAD
    (regression in 1.7.10); this makes it error out.
    
    By Erik Faye-Lund
    * ef/checkout-empty:
      checkout: do not corrupt HEAD on empty repo
    gitster committed May 11, 2012
  3. Merge branch 'jk/maint-reflog-walk-count-vs-time'

    Gives a better DWIM behaviour for --pretty=format:%gd, "stash list", and
    "log -g", depending on how the starting point ("master" vs "master@{0}" vs
    "master@{now}") and date formatting options (e.g. "--date=iso") are given
    on the command line.
    
    By Jeff King (4) and Junio C Hamano (1)
    * jk/maint-reflog-walk-count-vs-time:
      reflog-walk: tell explicit --date=default from not having --date at all
      reflog-walk: always make HEAD@{0} show indexed selectors
      reflog-walk: clean up "flag" field of commit_reflog struct
      log: respect date_mode_explicit with --format:%gd
      t1411: add more selector index/date tests
    gitster committed May 11, 2012
  4. Merge branch 'nd/i18n-branch-lego'

    Fix yet another message construction by concatenating pieces of sentenes,
    which is unfriendly to i18n.
    
    By Nguyễn Thái Ngọc Duy
    * nd/i18n-branch-lego:
      branch: remove lego in i18n tracking info strings
    gitster committed May 11, 2012
  5. Sync with 1.7.10.2

    gitster committed May 11, 2012
  6. Git 1.7.10.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 11, 2012
  7. Merge branch 'jc/diff-algo-cleanup' into maint

    * jc/diff-algo-cleanup:
      xdiff: PATIENCE/HISTOGRAM are not independent option bits
      xdiff: remove XDL_PATCH_* macros
    gitster committed May 11, 2012
  8. Merge branch 'ct/advise-push-default' into maint

    The cases "git push" fails due to non-ff can be broken into three
    categories; each case is given a separate advise message.
    
    By Christopher Tiwald (2) and Jeff King (1)
    * ct/advise-push-default:
      Fix httpd tests that broke when non-ff push advice changed
      clean up struct ref's nonfastforward field
      push: Provide situational hints for non-fast-forward errors
    gitster committed May 11, 2012
  9. Merge branch 'js/fast-import-test-9300' into maint

    By Johannes Sixt
    * js/fast-import-test-9300:
      t9300-fast-import: avoid 'exit' in test_expect_success snippets
    gitster committed May 11, 2012
  10. Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maint

    "git repack" used to write out unreachable objects as loose objects
    when repacking, even if such loose objects will immediately pruned
    due to its age.
    
    By Jeff King
    * jk/repack-no-explode-objects-from-old-pack:
      gc: use argv-array for sub-commands
      argv-array: add a new "pushl" method
      argv-array: refactor empty_argv initialization
      gc: do not explode objects which will be immediately pruned
    gitster committed May 11, 2012
  11. Merge branch 'ah/maint-grep-double-init' into maint

    By Angus Hammond
    * ah/maint-grep-double-init:
      grep.c: remove redundant line of code
    gitster committed May 11, 2012