Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.7.11.6
Commits on Sep 11, 2012
  1. Junio C Hamano

    Git 1.7.11.6

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

    Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11

    gitster authored
    * jc/maint-mergetool-style-fix:
      mergetool: style fixes
  3. Junio C Hamano

    Merge branch 'sz/submodule-force-update' into maint-1.7.11

    gitster authored
    * sz/submodule-force-update:
      Make 'git submodule update --force' always check out submodules.
  4. Junio C Hamano

    Merge branch 'ph/stash-rerere' into maint-1.7.11

    gitster authored
    * ph/stash-rerere:
      stash: invoke rerere in case of conflict
      test: git-stash conflict sets up rerere
  5. Junio C Hamano

    Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11

    gitster authored
    * jc/maint-sane-execvp-notdir:
      sane_execvp(): ignore non-directory on $PATH
  6. Junio C Hamano

    Merge branch 'jc/maint-config-exit-status' into maint-1.7.11

    gitster authored
    * jc/maint-config-exit-status:
      config: "git config baa" should exit with status 1
  7. Junio C Hamano

    Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11

    gitster authored
    * mh/maint-config-doc-proxy-command:
      git-config doc: unconfuse an example
      git-config.txt: fix example
  8. Junio C Hamano

    Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11

    gitster authored
    * hv/submodule-path-unmatch:
      Let submodule command exit with error status if path does not exist
  9. Junio C Hamano

    Merge branch 'mz/empty-rebase-test' into maint-1.7.11

    gitster authored
    * mz/empty-rebase-test:
      add tests for 'git rebase --keep-empty'
  10. Junio C Hamano

    Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11

    gitster authored
    * jk/docs-docbook-monospace-display:
      docs: monospace listings in docbook output
  11. Junio C Hamano

    Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11

    gitster authored
    * ab/diff-write-incomplete-line:
      Fix '\ No newline...' annotation in rewrite diffs
  12. Junio C Hamano

    Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11

    gitster authored
    * jc/maint-t7406-rev-parse-max-count-huh:
      t7406: fix misleading "rev-parse --max-count=1 HEAD"
  13. Junio C Hamano

    Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

    gitster authored
    * tr/void-diff-setup-done:
      diff_setup_done(): return void
  14. Junio C Hamano

    Merge branch 'tr/merge-recursive-flush' into maint-1.7.11

    gitster authored
    * tr/merge-recursive-flush:
      merge-recursive: eliminate flush_buffer() in favor of write_in_full()
  15. Junio C Hamano

    Merge branch 'nd/index-errno' into maint-1.7.11

    gitster authored
    * nd/index-errno:
      read_index_from: remove bogus errno assignments
  16. Junio C Hamano

    Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11

    gitster authored
    * pg/maint-apply-remove-unused-variable:
      apply: delete unused deflate_origlen from patch struct
Commits on Sep 10, 2012
  1. Junio C Hamano

    Almost 1.7.11.6

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

    Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11

    gitster authored
    The reflog entries left by "git rebase" and "git rebase -i" were
    inconsistent (the interactive one gave an abbreviated object name).
    
    * mg/rebase-i-onto-reflog-in-full:
      rebase -i: use full onto sha1 in reflog
  3. Junio C Hamano

    Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11

    gitster authored
    When the user exports a non-default IFS without HT, scripts that
    rely on being able to parse "ls-files -s | while read a b c..."
    start to fail.  Protect them from such a misconfiguration.
    
    * jc/maint-protect-sh-from-ifs:
      sh-setup: protect from exported IFS
  4. Junio C Hamano

    Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11

    gitster authored
    When "git push" triggered the automatic gc on the receiving end, a
    message from "git prune" that said it was removing cruft leaked to
    the standard output, breaking the communication protocol.
    
    * bc/receive-pack-stdout-protection:
      receive-pack: do not leak output from auto-gc to standard output
      t/t5400: demonstrate breakage caused by informational message from prune
  5. Junio C Hamano

    Merge branch 'jk/maint-null-in-trees' into maint-1.7.11

    gitster authored
    "git diff" had a confusion between taking data from a path in the
    working tree and taking data from an object that happens to have
    name 0{40} recorded in a tree.
    
    * jk/maint-null-in-trees:
      fsck: detect null sha1 in tree entries
      do not write null sha1s to on-disk index
      diff: do not use null sha1 as a sentinel value
  6. Junio C Hamano

    Merge branch 'tr/maint-send-email-2047' into maint-1.7.11

    gitster authored
    "git send-email" did not unquote encoded words that appear on the
    header correctly, and lost "_" from strings.
    
    * tr/maint-send-email-2047:
      send-email: improve RFC2047 quote parsing
  7. Junio C Hamano

    Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11

    gitster authored
    When the user gives an argument that can be taken as both a
    revision name and a pathname without disambiguating with "--", we
    used to give a help message "Use '--' to separate".  The message
    has been clarified to show where that '--' goes on the command
    line.
    
    * mm/die-with-dashdash-help:
      setup: clarify error messages for file/revisions ambiguity
  8. Junio C Hamano

    Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11

    gitster authored
    "gitweb" when used with PATH_INFO failed to notice directories with
    SP (and other characters that need URL-style quoting) in them.
    
    * js/gitweb-path-info-unquote:
      gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
Commits on Aug 24, 2012
  1. Junio C Hamano

    Prepare for 1.7.11.6

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

    Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11

    gitster authored
    A minor documentation update.
    
    * mv/pull-r-for-rebase:
      man: git pull -r is a short for --rebase
  3. Junio C Hamano

    Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11

    gitster authored
    We did not document that many commands take unique prefix
    abbreviations of long options (e.g. "--option" may be the only flag
    that the command accepts that begin with "--opt", in which case you
    can give "--opt") anywhere easy to find for new people.
    
    * jc/maint-abbrev-option-cli:
      gitcli: describe abbreviation of long options
  4. Junio C Hamano

    Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11

    gitster authored
    It was unclear what "--topo-order" was really about in the
    documentation. It is not just about "children before parent", but
    also about "don't mix lineages".
    
    * jc/maint-rev-list-topo-doc:
      rev-list docs: clarify --topo-order description
  5. Junio C Hamano

    Merge branch 'hv/coding-guidelines' into maint-1.7.11

    gitster authored
    In earlier days, "imitate the style in the neibouring code" was
    sufficient to keep the coherent style, but over time some parts of
    the codebase have drifted enough to make it ineffective.
    
    * hv/coding-guidelines:
      Documentation/CodingGuidelines: spell out more shell guidelines
  6. Junio C Hamano

    Merge branch 'jc/tag-doc' into maint-1.7.11

    gitster authored
    Our documentation used to assume having files in .git/refs/*
    directories was the only to have branches and tags, but that is not
    true for quite some time.
    
    * jc/tag-doc:
      Documentation: do not mention .git/refs/* directories
  7. Junio C Hamano

    Merge branch 'mk/test-seq' into maint-1.7.11

    gitster authored
    Add a compatibility/utility function to the test framework.
    
    * mk/test-seq:
      tests: Introduce test_seq
  8. Junio C Hamano

    Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11

    gitster authored
    * lp/no-cmd-http-fetch:
      builtin.h: remove unused cmd_<foo> declarations
  9. Junio C Hamano

    Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11

    gitster authored
    * bw/maint-1.7.9-solaris-getpass:
      Enable HAVE_DEV_TTY for Solaris
      terminal: seek when switching between reading and writing
  10. Junio C Hamano

    Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11

    gitster authored
    * jk/maint-commit-check-committer-early:
      commit: check committer identity more strictly
  11. Junio C Hamano

    Make 'git submodule update --force' always check out submodules.

    Stefan Zager authored gitster committed
    Currently, it will only do a checkout if the sha1 registered in the containing
    repository doesn't match the HEAD of the submodule, regardless of whether the
    submodule is dirty.  As discussed on the mailing list, the '--force' flag is a
    strong indicator that the state of the submodule is suspect, and should be reset
    to HEAD.
    
    Signed-off-by: Stefan Zager <szager@google.com>
    Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.