Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jul 9, 2012
  1. @gitster

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

    gitster authored
    Translation updates for various languages.
    
    * git://github.com/git-l10n/git-po:
      l10n: zh_CN.po: translate 29 new messages
      l10n: de.po: translate 29 new messages
      Update Swedish translation (1095t0f0u)
      l10n: Update translation for Vietnamese
      l10n: Update git.pot (29 new messages)
  2. @gitster

    Fifth batch for 1.7.12

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'cw/help-over-network'

    gitster authored
    "git help -w $cmd" can show HTML version of documentation for
    "git-$cmd" by setting help.htmlpath to somewhere other than the
    default location where the build procedure installs them locally;
    the variable can even point at a http:// URL.
    
    * cw/help-over-network:
      Allow help.htmlpath to be a URL prefix
      Add config variable to set HTML path for git-help --web
  4. @gitster

    Merge branch 'mz/empty-rebase-test'

    gitster authored
    We did not have test to make sure "git rebase" without extra options
    filters out an empty commit in the original history.
    
    * mz/empty-rebase-test:
      add test case for rebase of empty commit
  5. @gitster

    Merge branch 'pw/git-p4-tests'

    gitster authored
    More "git p4" tests.
    
    * pw/git-p4-tests:
      git p4 test: fix badp4dir test
      git p4 test: split up big t9800 test
      git p4 test: cleanup_git should make a new $git
      git p4 test: copy source indeterminate
      git p4 test: check for error message in failed test
      git p4 test: rename some "git-p4 command" strings
      git p4 test: never create default test repo
      git p4 test: simplify quoting involving TRASH_DIRECTORY
      git p4 test: use real_path to resolve p4 client symlinks
      git p4 test: wait longer for p4d to start and test its pid
  6. @gitster

    Merge branch 'js/fast-export-paths-with-spaces'

    gitster authored
    "git fast-export" produced an input stream for fast-import without
    properly quoting pathnames when they contain SPs in them.
    
    * js/fast-export-paths-with-spaces:
      fast-export: quote paths with spaces
  7. @gitster

    Merge branch 'cw/no-detaching-an-unborn'

    gitster authored
    "git checkout --detach", when you are still on an unborn branch,
    should be forbidden, but it wasn't.
    
    * cw/no-detaching-an-unborn:
      git-checkout: disallow --detach on unborn branch
  8. @gitster

    Merge branch 'vr/use-our-perl-in-tests'

    gitster authored
    Some implementations of Perl terminates "lines" with CRLF even when
    the script is operating on just a sequence of bytes.  Make sure to
    use "$PERL_PATH", the version of Perl the user told Git to use, in
    our tests to avoid unnecessary breakages in tests.
    
    * vr/use-our-perl-in-tests:
      t/README: add a bit more Don'ts
      tests: enclose $PERL_PATH in double quotes
      t/test-lib.sh: export PERL_PATH for use in scripts
      t: Replace 'perl' by $PERL_PATH
  9. @gitster

    Merge branch 'mm/credential-plumbing'

    gitster authored
    Expose the credential API to scripted Porcelain writers.
    
    * mm/credential-plumbing:
      git-remote-mediawiki: update comments to reflect credential support
      git-remote-mediawiki: add credential support
      git credential fill: output the whole 'struct credential'
      add 'git credential' plumbing command
  10. @gitster

    Merge branch 'jc/maint-blame-unique-abbrev'

    gitster authored
    "git blame" did not try to make sure the abbreviated commit object
    names in its output are unique.
    
    * jc/maint-blame-unique-abbrev:
      blame: compute abbreviation width that ensures uniqueness
  11. @gitster

    Merge branch 'jn/perl-makemaker-leading-paths'

    gitster authored
    * jn/perl-makemaker-leading-paths:
      perl/Makefile: Fix a missing double-quote
      perl/Makefile: move "mkdir -p" to module installation loop for maintainability
  12. @gitster

    Merge branch 'rj/platform-pread-may-be-thread-unsafe'

    gitster authored
    On Cygwin, the platform pread(3) is not thread safe, just like our
    own compat/ emulation, and cannot be used in the index-pack program.
    
    * rj/platform-pread-may-be-thread-unsafe:
      index-pack: Disable threading on cygwin
  13. @gitster

    Merge branch 'mm/config-xdg'

    gitster authored
    Teach git to read various information from $XDG_CONFIG_HOME/git/ to allow
    the user to avoid cluttering $HOME.
    
    * mm/config-xdg:
      config: write to $XDG_CONFIG_HOME/git/config file when appropriate
      Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes
      Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore
      config: read (but not write) from $XDG_CONFIG_HOME/git/config file
  14. @moy @gitster

    git-remote-mediawiki: update comments to reflect credential support

    moy authored gitster committed
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 6, 2012
  1. @jiangxin

    l10n: zh_CN.po: translate 29 new messages

    jiangxin authored
    Translate 29 new messages came from git.pot update in 11b9017
    (l10n: Update git.pot (29 new messages))
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Commits on Jul 5, 2012
  1. l10n: de.po: translate 29 new messages

    Ralf Thielow authored
    Translate 29 new messages came from git.pot update
    in 11b9017 (l10n: Update git.pot (29 new messages)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
  2. @gitster

    Fourth batch for 1.7.12

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'nd/clone-single-fix'

    gitster authored
    "git clone --single-branch" to clone a single branch did not limit
    the cloning to the specified branch.
    
    * nd/clone-single-fix:
      clone: fix ref selection in --single-branch --branch=xxx
  4. @gitster

    Merge branch 'th/diff-no-index-fixes'

    gitster authored
    "git diff --no-index" did not correctly handle relative paths and
    did not give correct exit codes when run under "--quiet" option.
    
    * th/diff-no-index-fixes:
      diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
      diff: handle relative paths in no-index
  5. @gitster

    Merge branch 'hv/remote-end-hung-up'

    gitster authored
    When we get disconnected while expecting a response from the remote
    side because authentication failed, we issued an error message "The
    remote side hung up unexpectedly."
    
    Give hint that it may be a permission problem in the message when we
    can reasonably suspect it.
    
    * hv/remote-end-hung-up:
      remove the impression of unexpectedness when access is denied
Commits on Jul 4, 2012
  1. @nafmo

    Update Swedish translation (1095t0f0u)

    nafmo authored
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Commits on Jul 3, 2012
  1. @andreas-schwab @gitster

    Fix formatting in git-config(1)

    andreas-schwab authored gitster committed
    This fixes two formatting bugs in the git-config documentation:
    
    - in the column.ui entry don't indent the last paragraph so that it isn't
      formatted as a literal paragraph
    - in the push.default entry separate the last paragraph from the
      nested list.
    
    Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @vnwildman

    l10n: Update translation for Vietnamese

    vnwildman authored
     * Translated 29 news
     * Fix some minor errors in old translation
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
  3. @jiangxin

    l10n: Update git.pot (29 new messages)

    jiangxin authored
    Generate po/git.pot from v1.7.11.1-107-g72601, and there are 29 new l10n
    messages.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Commits on Jul 2, 2012
  1. @gitster

    Sync with i18n-po updates in maint

    gitster authored
    # By Peter Krefting
    # Via Junio C Hamano (1) and Peter Krefting (1)
    * maint:
      Update Swedish translation (1066t0f0u)
  2. @gitster

    Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

    gitster authored
    Update Swedish translation (1066t0f0u)
  3. @gitster

    blame: compute abbreviation width that ensures uniqueness

    gitster authored
    Julia Lawall noticed that in linux-next repository the commit object
    60d5c9f5 (shown with the default abbreviation width baked into "git
    blame") in output from
    
      $ git blame -L 3675,3675 60d5c9f5b -- \
          drivers/staging/brcm80211/brcmfmac/wl_iw.c
    
    is no longer unique in the repository, which results in "short SHA1
    60d5c9f5 is ambiguous".
    
    Compute the minimum abbreviation width that ensures uniqueness when
    the user did not specify the --abbrev option to avoid this.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 1, 2012
  1. @nafmo

    Update Swedish translation (1066t0f0u)

    nafmo authored
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Commits on Jun 29, 2012
  1. @gitster

    perl/Makefile: Fix a missing double-quote

    Johannes Sixt authored gitster committed
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 28, 2012
  1. @gitster

    Third batch for 1.7.12

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'fc/git-prompt-script'

    gitster authored
    Split a rather heavy-ish "git completion" script out to create a
    separate "git prompting" script, to help lazy-autoloading of the
    completion part while making prompting part always available.
  3. @gitster

    Merge branch 'js/submodule-relative'

    gitster authored
    Teach "git submodule" deal with nested submodule structure where a
    module is contained within a module whose origin is specified as a
    relative URL to its superproject's origin.
  4. @gitster

    Merge branch 'lk/more-helpful-status-hints'

    gitster authored
    Give finer classification to various states of paths in conflicted
    state and offer advice messages in the "git status" output.
  5. @gitster

    Merge branch 'lk/rebase-i-x'

    gitster authored
    Teach "-x <cmd>" to "rebase -i" to insert "exec <cmd>" after each
    commit in the resulting history.
  6. @gitster

    Merge branch 'jc/rev-list-simplify-merges-first-parent'

    gitster authored
    When "--simplify-merges/by-decoration" is given together with
    "--first-parent" to "git log", the combination of these options
    makes the simplification logic to use in-core commit objects that
    haven't been examined for relevance, either producing incorrect
    result or taking too long to produce any output.  Teach the
    simplification logic to ignore commits that the first-parent
    traversal logic ignored when both are in effect to work around the
    issue.
Something went wrong with that request. Please try again.