Skip to content
Commits on Jan 6, 2012
  1. @gitster

    Git 1.7.8.3

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

    Merge branch 'jn/maint-gitweb-utf8-fix' into maint

    gitster committed
    * jn/maint-gitweb-utf8-fix:
      gitweb: Fix fallback mode of to_utf8 subroutine
      gitweb: Output valid utf8 in git_blame_common('data')
      gitweb: esc_html() site name for title in OPML
      gitweb: Call to_utf8() on input string in chop_and_escape_str()
  3. @gitster

    Merge branch 'maint-1.7.7' into maint

    gitster committed
    * maint-1.7.7:
      Documentation: rerere.enabled is the primary way to configure rerere
  4. @gitster

    Merge branch 'maint-1.7.6' into maint-1.7.7

    gitster committed
    * maint-1.7.6:
      Documentation: rerere.enabled is the primary way to configure rerere
  5. @trast @gitster

    Documentation: rerere.enabled is the primary way to configure rerere

    trast committed with gitster
    The wording seems to suggest that creating the directory is needed and the
    setting of rerere.enabled is only for disabling the feature by setting it
    to 'false'. But the configuration is meant to be the primary control and
    setting it to 'true' will enable it; the rr-cache directory will be
    created as necessary and the user does not have to create it.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 4, 2012
  1. @drizzd @gitster

    t5550: repack everything into one file

    drizzd committed with gitster
    Subsequently we assume that there is only one pack. Currently this is
    true only by accident. Pass '-a -d' to repack in order to guarantee that
    assumption to hold true.
    
    The prune-packed command is now redundant since repack -d already calls
    it.
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'nd/maint-parse-depth' into maint

    gitster committed
    * nd/maint-parse-depth:
      Catch invalid --depth option passed to clone or fetch
  3. @pclouds @gitster

    Catch invalid --depth option passed to clone or fetch

    pclouds committed with gitster
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 3, 2012
  1. @gitster

    Merge branch 'maint-1.7.7' into maint

    gitster committed
    * maint-1.7.7:
      docs: describe behavior of relative submodule URLs
      Documentation: read-tree --prefix works with existing subtrees
      Add MYMETA.json to perl/.gitignore
  2. @gitster

    Merge branch 'maint-1.7.6' into maint-1.7.7

    gitster committed
    * maint-1.7.6:
      Documentation: read-tree --prefix works with existing subtrees
      Add MYMETA.json to perl/.gitignore
  3. @jlehmann @gitster

    docs: describe behavior of relative submodule URLs

    jlehmann committed with gitster
    Since the relative submodule URLs have been introduced in f31a522, they
    do not conform to the rules for resolving relative URIs but rather to
    those of relative directories.
    
    Document that behavior.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @ferringb @gitster

    fix hang in git fetch if pointed at a 0 length bundle

    ferringb committed with gitster
    git-repo if interupted at the exact wrong time will generate zero
    length bundles- literal empty files.  git-repo is wrong here, but
    git fetch shouldn't effectively spin loop if pointed at a zero
    length bundle.
    
    Signed-off-by: Brian Harring <ferringb@chromium.org>
    Helped-by: Johannes Sixt
    Helped-by: Nguyen Thai Ngoc Duy
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 1, 2012
  1. @drizzd @gitster

    Documentation: read-tree --prefix works with existing subtrees

    drizzd committed with gitster
    Since 34110cd (Make 'unpack_trees()' have a separate source and
    destination index) it is no longer true that a subdirectory with
    the same prefix must not exist.
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 29, 2011
  1. @jacknagel @gitster

    Add MYMETA.json to perl/.gitignore

    jacknagel committed with gitster
    ExtUtils::MakeMaker generates MYMETA.json in addition to MYMETA.yml
    since version 6.57_07. As it suggests, it is just meta information about
    the build and is cleaned up with 'make clean', so it should be ignored.
    
    Signed-off-by: Jack Nagel <jacknagel@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 28, 2011
  1. @gitster

    Git 1.7.8.2

    gitster committed
    Contains accumulated fixes since 1.7.8 that have been merged to the
    'master' branch in preparation for the 1.7.9 release.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'jv/maint-config-set' into maint

    gitster committed
    * jv/maint-config-set:
      Fix an incorrect reference to --set-all.
  3. @gitster

    Merge branch 'jk/follow-rename-score' into maint

    gitster committed
    * jk/follow-rename-score:
      use custom rename score during --follow
  4. @gitster

    Merge branch 'jc/checkout-m-twoway' into maint

    gitster committed
    * jc/checkout-m-twoway:
      t/t2023-checkout-m.sh: fix use of test_must_fail
      checkout_merged(): squelch false warning from some gcc
      Test 'checkout -m -- path'
      checkout -m: no need to insist on having all 3 stages
  5. @gitster

    Merge branch 'tr/doc-sh-setup' into maint

    gitster committed
    * tr/doc-sh-setup:
      git-sh-setup: make require_clean_work_tree part of the interface
  6. @gitster

    Merge branch 'jk/maint-strbuf-missing-init' into maint

    gitster committed
    * jk/maint-strbuf-missing-init:
      commit, merge: initialize static strbuf
  7. @gitster

    Merge branch 'jk/maint-push-v-is-verbose' into maint

    gitster committed
    * jk/maint-push-v-is-verbose:
      make "git push -v" actually verbose
  8. @gitster

    Merge branch 'jk/http-push-to-empty' into maint

    gitster committed
    * jk/http-push-to-empty:
      remote-curl: don't pass back fake refs
    
    Conflicts:
    	remote-curl.c
  9. @gitster

    Merge branch 'jk/doc-fsck' into maint

    gitster committed
    * jk/doc-fsck:
      docs: brush up obsolete bits of git-fsck manpage
  10. @gitster

    Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint

    gitster committed
    * jc/maint-lf-to-crlf-keep-crlf:
      lf_to_crlf_filter(): resurrect CRLF->CRLF hack
  11. @gitster

    Merge branch 'ef/setenv-putenv' into maint

    gitster committed
    * ef/setenv-putenv:
      compat/setenv.c: error if name contains '='
      compat/setenv.c: update errno when erroring out
  12. @gitster

    Merge branch 'jc/advice-doc' into maint

    gitster committed
    * jc/advice-doc:
      advice: Document that they all default to true
  13. @gitster

    Merge branch 'jn/maint-sequencer-fixes' into maint

    gitster committed
    * jn/maint-sequencer-fixes:
      revert: stop creating and removing sequencer-old directory
      Revert "reset: Make reset remove the sequencer state"
      revert: do not remove state until sequence is finished
      revert: allow single-pick in the middle of cherry-pick sequence
      revert: pass around rev-list args in already-parsed form
      revert: allow cherry-pick --continue to commit before resuming
      revert: give --continue handling its own function
  14. @gitster

    Merge branch 'jk/maint-snprintf-va-copy' into maint

    gitster committed
    * jk/maint-snprintf-va-copy:
      compat/snprintf: don't look at va_list twice
  15. @gitster

    Merge branch 'jk/maint-push-over-dav' into maint

    gitster committed
    * jk/maint-push-over-dav:
      http-push: enable "proactive auth"
      t5540: test DAV push with authentication
  16. @gitster

    Merge branch 'jk/maint-mv' into maint

    gitster committed
    * jk/maint-mv:
      mv: be quiet about overwriting
      mv: improve overwrite warning
      mv: make non-directory destination error more clear
      mv: honor --verbose flag
      docs: mention "-k" for both forms of "git mv"
  17. @gitster

    Merge branch 'jk/fetch-no-tail-match-refs' into maint

    gitster committed
    * jk/fetch-no-tail-match-refs:
      connect.c: drop path_match function
      fetch-pack: match refs exactly
      t5500: give fully-qualified refs to fetch-pack
      drop "match" parameter from get_remote_heads
  18. @gitster

    Merge branch 'ew/keepalive' into maint

    gitster committed
    * ew/keepalive:
      enable SO_KEEPALIVE for connected TCP sockets
  19. @gitster

    Merge branch 'ci/stripspace-docs' into maint

    gitster committed
    * ci/stripspace-docs:
      Update documentation for stripspace
  20. @gitster

    Merge branch 'jh/fast-import-notes' into maint

    gitster committed
    * jh/fast-import-notes:
      fast-import: Fix incorrect fanout level when modifying existing notes refs
      t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
      t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
  21. @gitster

    Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint

    gitster committed
    * aw/rebase-i-stop-on-failure-to-amend:
      rebase -i: interrupt rebase when "commit --amend" failed during "reword"
Something went wrong with that request. Please try again.