Permalink
Commits on Jun 7, 2012
  1. @gitster

    Git 1.7.11-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 7, 2012
  2. @gitster

    Merge branch 'mm/api-credentials-doc'

    * mm/api-credentials-doc:
      api-credentials.txt: add "see also" section
      api-credentials.txt: mention credential.helper explicitly
      api-credentials.txt: show the big picture first
      doc: fix xref link from api docs to manual pages
    gitster committed Jun 7, 2012
  3. @gitster

    Merge branch 'rr/maint-t3510-cascade-fix'

    * rr/maint-t3510-cascade-fix:
      t3510 (cherry-pick-sequence): add missing '&&'
    gitster committed Jun 7, 2012
  4. @gitster

    Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'

    Regression fix for people with libsvn between 1.6.12 and 1.6.15, on
    which we tried to use the non-working platform auth providers.
    
    * jc/svn-auth-providers-unusable-at-1.6.12:
      git-svn: platform auth providers are working only on 1.6.15 or newer
    gitster committed Jun 7, 2012
  5. @gitster

    Merge branch 'cr/persistent-https'

    A remote helper that acts as a proxy and caches ssl session for the
    https:// transport is added to the contrib/ area.
    
    By Colby Ranger
    * cr/persistent-https:
      Add persistent-https to contrib
    gitster committed Jun 7, 2012
Commits on Jun 5, 2012
  1. @gitster

    Merge git://github.com/git-l10n/git-po

    German and Chinese translation updates.
    
    By Ralf Thielow (4) and others
    via Jiang Xin (1) and Tran Ngoc Quan (1)
    * git://github.com/git-l10n/git-po:
      l10n: Update translation for Vietnamese
      l10n: de.po: add additional newline
      l10n: de.po: translate 2 new, 3 fuzzy messages
      l10n: de.po: translate 41 new messages
      l10n: de.po: translate 265 new messages
      l10n: zh_CN.po: translate 2 new, 3 fuzzy messages
      l10n: Update git.pot (5 new, 3 removed messages)
    gitster committed Jun 5, 2012
Commits on Jun 4, 2012
  1. @artagnon @gitster

    t3510 (cherry-pick-sequence): add missing '&&'

    Breaks in a test assertion's && chain can potentially hide failures
    from earlier commands in the chain.  Fix an instance of this in the
    setup.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Jun 4, 2012
  2. @moy @gitster

    api-credentials.txt: add "see also" section

    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Jun 4, 2012
  3. @moy @gitster

    api-credentials.txt: mention credential.helper explicitly

    The name of the configuration variable was mentioned only at the very
    end of the explanation, in a place specific to a specific rule, hence it
    was not very clear what the specification was about.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Jun 4, 2012
  4. @moy @gitster

    api-credentials.txt: show the big picture first

    The API documentation targets two kinds of developers: those using the
    C API, and those writing remote-helpers. The document was not clear
    about which part was useful to which category, and for example, the C API
    could be mistakenly thought as an API for writting remote helpers.
    
    Based-on-patch-by: Jeff King <peff@peff.net>
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Jun 4, 2012
  5. @gitster

    doc: fix xref link from api docs to manual pages

    They are one-level above, so refer them as linkgit:../git-foo[n] with "../"
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 4, 2012
  6. @gitster

    git-svn: platform auth providers are working only on 1.6.15 or newer

    Matthijs Kooijman reports that the cut-off point 082afee (git-svn:
    use platform specific auth providers, 2012-04-26) set at 1.6.12 to
    use this feature safely was incorrect, and it is 1.6.15 instead:
    
        http://svn.apache.org/repos/asf/subversion/trunk/CHANGES
        Version 1.6.15
           * improve some swig parameter mapping (r984565, r1035745)
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    gitster committed Jun 4, 2012
  7. @jiangxin

    Merge git://github.com/ralfth/git-po-de

    By Ralf Thielow
    via Ralf Thielow
    * ralfth/git-po-de/master:
      l10n: de.po: add additional newline
      l10n: de.po: translate 2 new, 3 fuzzy messages
      l10n: de.po: translate 41 new messages
      l10n: de.po: translate 265 new messages
    jiangxin committed Jun 4, 2012
  8. @vnwildman

    l10n: Update translation for Vietnamese

     * Updated 5 strings for v1.7.11-rc0-100-g5498c
     * Retranslated about 16 strings
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed Jun 2, 2012
Commits on Jun 3, 2012
  1. @gitster

    Git 1.7.11-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 3, 2012
  2. @gitster

    Sync with 1.7.10.4

    * maint:
      Git 1.7.10.4
    gitster committed Jun 3, 2012
  3. @gitster

    Git 1.7.10.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 3, 2012
  4. @gitster

    Merge branch 'ef/maint-rebase-error-message' into maint

    When "git rebase" was given a bad commit to replay the history on,
    its error message did not correctly give the command line argument
    it had trouble parsing.
    
    By Erik Faye-Lund
    * ef/maint-rebase-error-message:
      rebase: report invalid commit correctly
    gitster committed Jun 3, 2012
Commits on Jun 2, 2012
  1. @ralfth

    l10n: de.po: add additional newline

    The translation of "builtin/gc.c:224" was missing of
    a newline which made the second part of the message
    quite long. We simply add a newline.
    
    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    ralfth committed Jun 2, 2012
  2. @ralfth

    l10n: de.po: translate 2 new, 3 fuzzy messages

    Translate 2 new and 3 fuzzy messages came from git.pot update
    in 75f7b4b (l10n: Update git.pot (5 new, 3 removed messages)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    ralfth committed Jun 2, 2012
  3. @ralfth

    l10n: de.po: translate 41 new messages

    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    ralfth committed May 23, 2012
  4. @ralfth

    l10n: de.po: translate 265 new messages

    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    ralfth committed May 18, 2012
  5. @jiangxin

    l10n: zh_CN.po: translate 2 new, 3 fuzzy messages

    Translate 2 new and 3 fuzzy messages came from git.pot update
    in 75f7b4b (l10n: Update git.pot (5 new, 3 removed messages)).
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Jun 2, 2012
Commits on Jun 1, 2012
  1. @jiangxin

    l10n: Update git.pot (5 new, 3 removed messages)

    Generate po/git.pot from v1.7.11-rc0-100-g5498c:
    
     * 5 new l10n messages at lines:
       635, 639, 1203, 1208, 3946
    
     * 3 removed l10n messages at lines:
       1194, 3158, 3936
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Jun 1, 2012
  2. @gitster

    Update draft release notes to 1.7.11

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 1, 2012
  3. @gitster

    Merge branch 'ef/maint-rebase-error-message'

    By Erik Faye-Lund
    * ef/maint-rebase-error-message:
      rebase: report invalid commit correctly
    gitster committed Jun 1, 2012
  4. @gitster

    Merge branch 'nh/empty-rebase'

    * nh/empty-rebase:
      cherry-pick: regression fix for empty commits
    gitster committed Jun 1, 2012
  5. @gitster

    Merge branch 'vr/rebase-autosquash-does-not-imply-i'

    "git rebase -p" used to pay attention to rebase.autosquash which was
    wrong.  "git rebase -p -i" should, but "git rebase -p" by itself
    should not.
    
    By Vincent van Ravesteijn
    * vr/rebase-autosquash-does-not-imply-i:
      Do not autosquash in case of an implied interactive rebase
    gitster committed Jun 1, 2012
  6. @gitster

    Merge branch 'mm/levenstein-penalize-deletion-less'

    "git tags" used to suggest "git stage" which was nonsense; it should
    have favored "git tag".  Tweak the cost of deletion to correct it.
    
    By Matthieu Moy
    * mm/levenstein-penalize-deletion-less:
      Reduce cost of deletion in levenstein distance (4 -> 3)
    gitster committed Jun 1, 2012
  7. @gitster

    Merge branch 'jl/submodule-report-new-path-once'

    "git submodule init" used to report "registered for path ..."  even
    for submodules that were registered earlier.
    
    By Jens Lehmann
    * jl/submodule-report-new-path-once:
      submodules: print "registered for path" message only once
    gitster committed Jun 1, 2012
  8. @gitster

    Sync with maint

    gitster committed Jun 1, 2012
  9. @gitster

    Start preparing for 1.7.10.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 1, 2012
  10. @gitster

    Merge branch 'ef/http-o-depends-on-gvf' into maint

    A minor compilation fix.
    
    By Erik Faye-Lund
    * ef/http-o-depends-on-gvf:
      Makefile: add missing GIT-VERSION-FILE dependency
    gitster committed Jun 1, 2012
  11. @gitster

    Merge git://github.com/git-l10n/git-po

    By Jiang Xin (4) and others
    via Jiang Xin
    * git://github.com/git-l10n/git-po:
      l10n: Set nplurals of zh_CN.po from 1 to 2
      l10n: zh_CN.po: translate 323 new messages
      l10n: zh.CN.po: update by msgmerge git.pot
      First release translation for Vietnamese
      Init translation for Vietnamese
      l10n: New it.po file with 504 translations
      Update Swedish translation (728t0f0u)
      l10n: Update git.pot (41 new messages)
    gitster committed Jun 1, 2012
  12. @gitster

    Merge branch 'rs/maint-grep-F' into maint

    "git grep -e '$pattern'", unlike the case where the patterns are read from
    a file, did not treat individual lines in the given pattern argument as
    separate regular expressions as it should.
    
    By René Scharfe
    * rs/maint-grep-F:
      grep: stop leaking line strings with -f
      grep: support newline separated pattern list
      grep: factor out do_append_grep_pat()
      grep: factor out create_grep_pat()
    gitster committed Jun 1, 2012