Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 7, 2012
  1. @gitster

    Git 1.8.1-rc1

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

    Documentation/diff-config: work around AsciiDoc misfortune

    gitster authored
    The line that happens to begin with indent followed by "3. " was
    interpreted as if it was an enumerated list; just wrap the lines
    differently to work it around for now.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Update draft release notes to 1.8.0.2
  4. @gitster

    Update draft release notes to 1.8.0.2

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

    Merge branch 'jc/doc-push-satellite' into maint

    gitster authored
    * jc/doc-push-satellite:
      Documentation/git-push.txt: clarify the "push from satellite" workflow
  6. @gitster

    Merge branch 'jc/same-encoding' into maint

    gitster authored
    Various codepaths checked if two encoding names are the same using
    ad-hoc code and some of them ended up asking iconv() to convert
    between "utf8" and "UTF-8".  The former is not a valid way to spell
    the encoding name, but often people use it by mistake, and we
    equated them in some but not all codepaths. Introduce a new helper
    function to make these codepaths consistent.
    
    * jc/same-encoding:
      reencode_string(): introduce and use same_encoding()
  7. @gitster

    Merge branch 'lt/diff-stat-show-0-lines' into maint

    gitster authored
    "git diff --stat" miscounted the total number of changed lines when
    binary files were involved and hidden beyond --stat-count.  It also
    miscounted the total number of changed files when there were
    unmerged paths.
    
    * lt/diff-stat-show-0-lines:
      t4049: refocus tests
      diff --shortstat: do not count "unmerged" entries
      diff --stat: do not count "unmerged" entries
      diff --stat: move the "total count" logic to the last loop
      diff --stat: use "file" temporary variable to refer to data->files[i]
      diff --stat: status of unmodified pair in diff-q is not zero
      test: add failing tests for "diff --stat" to t4049
      Fix "git diff --stat" for interesting - but empty - file changes
  8. @gitster

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

    gitster authored
    * 'master' of git://github.com/git-l10n/git-po:
      l10n: de.po: translate 22 new messages
      l10n: de.po: translate 825 new messages
      l10n: Update Swedish translation (1979t0f0u)
      l10n: vi.po: update to git-v1.8.0.1-347-gf94c3
      l10n: Update git.pot (5 new, 1 removed messages)
  9. @gitster

    Merge branch 'rr/t4041-cleanup'

    gitster authored
    * rr/t4041-cleanup:
      t4041 (diff-submodule-option): modernize style
      t4041 (diff-submodule-option): rewrite add_file() routine
      t4041 (diff-submodule-option): parse digests sensibly
      t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs
  10. @jiangxin

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

    jiangxin authored
    * 'rt/de-l10n-updates-for-1.8.1' of git://github.com/ralfth/git-po-de:
      l10n: de.po: translate 22 new messages
      l10n: de.po: translate 825 new messages
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Commits on Dec 6, 2012
  1. l10n: de.po: translate 22 new messages

    Ralf Thielow authored
    Translate 22 new messages came from git.pot
    updates in 9306b5b (l10n: Update git.pot (3 new,
    6 removed messages)), fe52cd6 (l10n: Update git.pot
    (14 new, 3 removed messages)) and f9472e3
    (l10n: Update git.pot (5 new, 1 removed messages)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Reviewed-by: Michael J Gruber <git@drmicha.warpmail.net>
  2. l10n: de.po: translate 825 new messages

    Ralf Thielow authored
    Translate 825 new messages came from git.pot update in
    cc76011 ("l10n: Update git.pot (825 new, 24 removed messages)").
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Reviewed-by: Thomas Rast <trast@student.ethz.ch>
    Helped-by: Michael J Gruber <git@drmicha.warpmail.net>
Commits on Dec 4, 2012
  1. @gitster

    Merge branch 'mm/status-push-pull-advise'

    gitster authored
    * mm/status-push-pull-advise:
      document that statusHints affects git checkout
  2. @moy @gitster

    document that statusHints affects git checkout

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

    Git 1.8.1-rc0

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

    Merge branch 'mm/status-push-pull-advise'

    gitster authored
    Finishing touch to allow the new advice message squelched
    with an advice.* configuration variable.
    
    * mm/status-push-pull-advise:
      status: respect advice.statusHints for ahead/behind advice
  3. @peff @gitster

    status: respect advice.statusHints for ahead/behind advice

    peff authored gitster committed
    If the user has unset advice.statusHints, we already
    suppress the "use git reset to..." hints in each stanza. The
    new "use git push to publish..." hint is the same type of
    hint. Let's respect statusHints for it, rather than making
    the user set yet another advice flag.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 2, 2012
  1. @artagnon @gitster

    t4041 (diff-submodule-option): modernize style

    artagnon authored gitster committed
    - Enclose tests in single quotes as opposed to double quotes.  This is
      the prevalent style in other tests.
    - Remove the unused variable $head4_full.
    - Indent the expected output so that it lines up with the rest of the
      test text.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @artagnon @gitster

    t4041 (diff-submodule-option): rewrite add_file() routine

    artagnon authored gitster committed
    Instead of "cd there and then come back", use the "cd there in a
    subshell" pattern.  Also fix '&&' chaining in one place.
    
    Suggested-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @artagnon @gitster

    t4041 (diff-submodule-option): parse digests sensibly

    artagnon authored gitster committed
    `git rev-list --max-count=1 HEAD` is a roundabout way of saying `git
    rev-parse --verify HEAD`; replace a bunch of instances of the former
    with the latter.  Also, don't unnecessarily `cut -c1-7` the rev-parse
    output when the `--short` option is available.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 30, 2012
  1. @nafmo

    l10n: Update Swedish translation (1979t0f0u)

    nafmo authored
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
  2. @vnwildman

    l10n: vi.po: update to git-v1.8.0.1-347-gf94c3

    vnwildman authored
     * updated all new messages (1979t0f0u)
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
  3. @jiangxin

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

    jiangxin authored
    L10n for git 1.8.1 round 2: Generate po/git.pot from v1.8.0.1-347-gf94c3.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Commits on Nov 29, 2012
  1. @gitster
  2. @gitster

    Merge branch 'pw/p4-various-fixes'

    gitster authored
    * pw/p4-various-fixes:
      git p4: remove unneeded cmd initialization
      git p4: fix labelDetails typo in exception
      git p4 test: display unresolvable host error
      git p4: catch p4 errors when streaming file contents
      git p4: handle servers without move support
      git p4: catch p4 describe errors
  3. @gitster

    Merge branch 'lt/diff-stat-show-0-lines'

    gitster authored
    "git diff --stat" miscounted the total number of changed lines when
    binary files were involved and hidden beyond --stat-count.  It also
    miscounted the total number of changed files when there were
    unmerged paths.
    
    * lt/diff-stat-show-0-lines:
      t4049: refocus tests
      diff --shortstat: do not count "unmerged" entries
      diff --stat: do not count "unmerged" entries
      diff --stat: move the "total count" logic to the last loop
      diff --stat: use "file" temporary variable to refer to data->files[i]
      diff --stat: status of unmodified pair in diff-q is not zero
      test: add failing tests for "diff --stat" to t4049
  4. @gitster

    Merge branch 'fc/remote-hg'

    gitster authored
    New remote helper for hg.
    
    * fc/remote-hg: (22 commits)
      remote-hg: fix for older versions of python
      remote-hg: fix for files with spaces
      remote-hg: avoid bad refs
      remote-hg: try the 'tip' if no checkout present
      remote-hg: fix compatibility with older versions of hg
      remote-hg: add missing config for basic tests
      remote-hg: the author email can be null
      remote-hg: add option to not track branches
      remote-hg: add extra author test
      remote-hg: add tests to compare with hg-git
      remote-hg: add bidirectional tests
      test-lib: avoid full path to store test results
      remote-hg: add basic tests
      remote-hg: fake bookmark when there's none
      remote-hg: add compat for hg-git author fixes
      remote-hg: add support for hg-git compat mode
      remote-hg: match hg merge behavior
      remote-hg: make sure the encoding is correct
      remote-hg: add support to push URLs
      remote-hg: add support for remote pushing
      ...
  5. @gitster

    Merge branch 'mk/complete-tcsh'

    gitster authored
    Finishing touches for tcsh completion.
    
    * mk/complete-tcsh:
      Support for git aliasing for tcsh completion
  6. @gitster

    Merge branch 'jc/doc-push-satellite'

    gitster authored
    * jc/doc-push-satellite:
      Documentation/git-push.txt: clarify the "push from satellite" workflow
  7. @gitster

    Merge branch 'km/send-email-remove-cruft-in-address'

    gitster authored
    * km/send-email-remove-cruft-in-address:
      git-send-email: allow edit invalid email address
      git-send-email: ask what to do with an invalid email address
      git-send-email: remove invalid addresses earlier
      git-send-email: fix fallback code in extract_valid_address()
      git-send-email: remove garbage after email address
  8. @gitster

    Merge branch 'jk/send-email-sender-prompt'

    gitster authored
    General clean-ups in various areas, originally written to support a
    patch that later turned out to be unneeded.
    
    * jk/send-email-sender-prompt:
      t9001: check send-email behavior with implicit sender
      t: add tests for "git var"
      ident: keep separate "explicit" flags for author and committer
      ident: make user_ident_explicitly_given static
      t7502: factor out autoident prerequisite
      test-lib: allow negation of prerequisites
  9. @gitster

    Merge branch 'fc/send-email-no-sender-prompt'

    gitster authored
    * fc/send-email-no-sender-prompt:
      send-email: avoid questions when user has an ident
  10. @gitster

    Merge branch 'er/doc-add-new-commands'

    gitster authored
    * er/doc-add-new-commands:
      Documentation: how to add a new command
  11. @gitster

    Merge branch 'jl/submodule-rm'

    gitster authored
    Finishing touches to "git rm $submodule" that removes the working
    tree of a submodule.
    
    * jl/submodule-rm:
      Teach rm to remove submodules when given with a trailing '/'
  12. @gitster

    Merge branch 'pp/gitweb-config-underscore'

    gitster authored
    The key "gitweb.remote_heads" is not legal git config; this maps it to
    "gitweb.remoteheads".
    
    * pp/gitweb-config-underscore:
      gitweb: make remote_heads config setting work
Something went wrong with that request. Please try again.