Skip to content
Commits on Mar 7, 2013
  1. @gitster

    Git 1.8.2-rc3

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

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

    * 'master' of git://github.com/git-l10n/git-po:
      l10n: zh_CN.po: translate 1 new message
      l10n: de.po: translate 1 new message
      l10n: vi.po: Update translation (2009t0f0u)
      l10n: Update Swedish translation (2009t0f0u)
      l10n: git.pot: v1.8.2 round 4 (1 changed)
    gitster committed Mar 7, 2013
  3. @gitster

    Merge branch 'mp/complete-paths'

    * mp/complete-paths:
      git-completion.zsh: define __gitcomp_file compatibility function
    gitster committed Mar 7, 2013
  4. @gitster

    Merge branch 'maint'

    * maint:
      gitweb/README: remove reference to git.kernel.org
    gitster committed Mar 7, 2013
  5. @gitster

    Merge branch 'mh/maint-ceil-absolute' into maint

    * mh/maint-ceil-absolute:
      Provide a mechanism to turn off symlink resolution in ceiling paths
    gitster committed Mar 7, 2013
  6. @iveqy @gitster

    gitweb/README: remove reference to git.kernel.org

    git.kernel.org no longer uses gitweb but has switched to cgit.
    
    Info about this can be found on: https://www.kernel.org/pelican.html
    or simply by looking at http://git.kernel.org . This is change since
    2013-03-01.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    iveqy committed with gitster Mar 7, 2013
  7. @jiangxin

    l10n: zh_CN.po: translate 1 new message

    Translate 1 new message came from git.pot update in ed1ddaf
    (l10n: git.pot: v1.8.2 round 4 (1 changed)).
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Mar 5, 2013
Commits on Mar 6, 2013
  1. @ralfth

    l10n: de.po: translate 1 new message

    Translate 1 new message came from git.pot update in
    ed1ddaf (l10n: git.pot: v1.8.2 round 4 (1 changed)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    ralfth committed Mar 5, 2013
  2. @vnwildman

    l10n: vi.po: Update translation (2009t0f0u)

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed Mar 6, 2013
Commits on Mar 5, 2013
  1. @moy @gitster

    git-completion.zsh: define __gitcomp_file compatibility function

    Commit fea16b4 (Fri Jan 11 19:48:43 2013, Manlio Perillo,
    git-completion.bash: add support for path completion), introduced a new
    __gitcomp_file function that uses the bash builtin "compgen". The
    function was redefined for ZSH in the deprecated section of
    git-completion.bash, but not in the new git-completion.zsh script.
    
    As a result, users of git-completion.zsh trying to complete "git add
    fo<tab>" get an error:
    
    git add fo__gitcomp_file:8: command not found: compgen
    
    This patch adds the redefinition and removes the error.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Mar 5, 2013
  2. @nafmo

    l10n: Update Swedish translation (2009t0f0u)

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    nafmo committed Mar 5, 2013
  3. @jiangxin

    l10n: git.pot: v1.8.2 round 4 (1 changed)

    Generate po/git.pot from v1.8.2-rc2-4-g77995 for git v1.8.2
    l10n round 4.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Mar 5, 2013
Commits on Mar 4, 2013
  1. @gitster

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

    * git://github.com/git-l10n/git-po:
      l10n: de.po: correct translation of "bisect" messages
      l10n: de.po: translate 5 new messages
      l10n: de.po: translate 35 new messages
    gitster committed Mar 4, 2013
Commits on Mar 3, 2013
  1. @gitster

    Git 1.8.2-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 3, 2013
Commits on Mar 1, 2013
  1. @gitster

    Sync with 1.8.1.5

    gitster committed Mar 1, 2013
  2. @gitster

    Git 1.8.1.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 1, 2013
  3. @trast @gitster

    Make !pattern in .gitattributes non-fatal

    Before 82dce99 (attr: more matching optimizations from .gitignore,
    2012-10-15), .gitattributes did not have any special treatment of a
    leading '!'.  The docs, however, always said
    
      The rules how the pattern matches paths are the same as in
      `.gitignore` files; see linkgit:gitignore[5].
    
    By those rules, leading '!' means pattern negation.  So 82dce99
    correctly determined that this kind of line makes no sense and should
    be disallowed.
    
    However, users who actually had a rule for files starting with a '!'
    are in a bad position: before 82dce99 '!' matched that literal
    character, so it is conceivable that users have .gitattributes with
    such lines in them.  After 82dce99 the unescaped version was
    disallowed in such a way that git outright refuses to run(!) most
    commands in the presence of such a .gitattributes.  It therefore
    becomes very hard to fix, let alone work with, such repositories.
    
    Let's at least allow the users to fix their repos: change the fatal
    error into a warning.
    
    Reported-by: mathstuf@gmail.com
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Mar 1, 2013
  4. @gitster

    Merge branch 'wk/user-manual' into maint

    * wk/user-manual:
      user-manual: Flesh out uncommitted changes and submodule updates
      user-manual: Use request-pull to generate "please pull" text
      user-manual: Reorganize the reroll sections, adding 'git rebase -i'
    gitster committed Mar 1, 2013
  5. @andrewkww @gitster

    Documentation/githooks: Fix linkgit

    Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    andrewkww committed with gitster Mar 1, 2013
Commits on Feb 27, 2013
  1. @gitster

    Merge branch 'maint'

    * maint:
      Update draft release notes to 1.8.1.5
      Documentation/submodule: Add --force to update synopsis
    gitster committed Feb 27, 2013
  2. @gitster

    Update draft release notes to 1.8.1.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 27, 2013
  3. @gitster

    Merge branch 'ef/non-ascii-parse-options-error-diag' into maint

    * ef/non-ascii-parse-options-error-diag:
      parse-options: report uncorrupted multi-byte options
    gitster committed Feb 27, 2013
  4. @gitster

    Merge branch 'wk/man-deny-current-branch-is-default-these-days' into …

    …maint
    
    * wk/man-deny-current-branch-is-default-these-days:
      user-manual: typofix (ofthe->of the)
      user-manual: Update for receive.denyCurrentBranch=refuse
    gitster committed Feb 27, 2013
  5. @gitster

    Merge branch 'jn/less-reconfigure' into maint

    * jn/less-reconfigure:
      Makefile: avoid infinite loop on configure.ac change
    gitster committed Feb 27, 2013
  6. @gitster

    Merge branch 'mh/maint-ceil-absolute'

    An earlier workaround designed to help people who list logical
    directories that will not match what getcwd(3) returns in the
    GIT_CEILING_DIRECTORIES had an adverse effect when it is slow to
    stat and readlink a directory component of an element listed on it.
    
    * mh/maint-ceil-absolute:
      Provide a mechanism to turn off symlink resolution in ceiling paths
    gitster committed Feb 27, 2013
  7. @bradking @gitster

    Documentation/submodule: Add --force to update synopsis

    In commit 9db31bd (submodule: Add --force option for git submodule
    update, 2011-04-01) we added the option to the implementation's usage
    synopsis but forgot to add it to the synopsis in the command
    documentation.  Add the option to the synopsis in the same location it
    is reported in usage and re-wrap the options to avoid long lines.
    
    Signed-off-by: Brad King <brad.king@kitware.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bradking committed with gitster Feb 26, 2013
Commits on Feb 26, 2013
  1. @gitster

    Merge branch 'for-junio' of git://github.com/kusma/git

    * 'for-junio' of git://github.com/kusma/git:
      wincred: improve compatibility with windows versions
      wincred: accept CRLF on stdin to simplify console usage
    gitster committed Feb 26, 2013
  2. @kusma @gitster

    Revert "compat: add strtok_r()"

    This reverts commit 78457bc.
    
    commit 28c5d9e ("vcs-svn: drop string_pool") previously removed
    the only call-site for strtok_r. So let's get rid of the compat
    implementation as well.
    
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    kusma committed with gitster Feb 26, 2013
  3. @kblees @kusma

    wincred: improve compatibility with windows versions

    On WinXP, the windows credential helper doesn't work at all (due to missing
    Cred[Un]PackAuthenticationBuffer APIs). On Win7, the credential format used
    by wincred is incompatible with native Windows tools (such as the control
    panel applet or 'cmdkey.exe /generic'). These Windows tools only set the
    TargetName, UserName and CredentialBlob members of the CREDENTIAL
    structure (where CredentialBlob is the UTF-16-encoded password).
    
    Remove the unnecessary packing / unpacking of the password, along with the
    related API definitions, for compatibility with Windows XP.
    
    Don't use CREDENTIAL_ATTRIBUTEs to identify credentials for compatibility
    with Windows credential manager tools. Parse the protocol, username, host
    and path fields from the credential's target name instead.
    
    Credentials created with an old wincred version will have mangled or empty
    passwords after this change.
    
    Signed-off-by: Karsten Blees <blees@dcon.de>
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    kblees committed with kusma Jan 10, 2013
  4. @kblees @kusma

    wincred: accept CRLF on stdin to simplify console usage

    The windows credential helper currently only accepts LF on stdin, but bash
    and cmd.exe both send CRLF. This prevents interactive use in the console.
    
    Change the stdin parser to optionally accept CRLF.
    
    Signed-off-by: Karsten Blees <blees@dcon.de>
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    kblees committed with kusma Jan 9, 2013
  5. @ralfth

    l10n: de.po: correct translation of "bisect" messages

    The term "bisect" was translated as "halbieren", we should
    translate it as "binäre Suche" (binary search). While at
    there, we should leave "bisect run" untranslated since it's
    a subcommand of "git bisect".
    
    Suggested-by: Thomas Rast <trast@inf.ethz.ch>
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    ralfth committed Feb 23, 2013
  6. @ralfth

    l10n: de.po: translate 5 new messages

    Translate 5 new messages came from git.pot update in 235537a
    (l10n: git.pot: v1.8.2 round 3 (5 new)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Acked-by: Thomas Rast <trast@inf.ethz.ch>
    ralfth committed Feb 19, 2013
  7. @ralfth

    l10n: de.po: translate 35 new messages

    Translate 35 new messages came from git.pot update
    in 9caaf23 (l10n: Update git.pot (35 new, 14 removed
    messages)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Acked-by: Thomas Rast <trast@inf.ethz.ch>
    ralfth committed Feb 14, 2013
Commits on Feb 25, 2013
  1. @gitster

    Git 1.8.2-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 25, 2013
  2. @gitster

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

    * git://github.com/git-l10n/git-po:
      l10n: vi.po: Updated 5 new messages (2009t0f0u)
      l10n: Update Swedish translation (2009t0f0u)
      l10n: Update Swedish translation (2004t0f0u)
      l10n: zh_CN.po: translate 5 new messages
      l10n: git.pot: v1.8.2 round 3 (5 new)
    gitster committed Feb 25, 2013
Something went wrong with that request. Please try again.