1. 18 Jun, 2009 1 commit
  2. 14 Jun, 2009 4 commits
  3. 13 Jun, 2009 12 commits
    • Junio C Hamano's avatar
      Merge branch 'mh/fix-send-email-threaded' · 08ba2489
      Junio C Hamano authored
      * mh/fix-send-email-threaded:
        send-email: fix a typo in a comment
        send-email: fix threaded mails without chain-reply-to
        add a test for git-send-email for threaded mails without chain-reply-to
        doc/send-email: clarify the behavior of --in-reply-to with --no-thread
        send-email: fix non-threaded mails
        add a test for git-send-email for non-threaded mails
      08ba2489
    • Junio C Hamano's avatar
      Merge branch 'rc/http-push' · e2486193
      Junio C Hamano authored
      * rc/http-push: (22 commits)
        http*: add helper methods for fetching objects (loose)
        http*: add helper methods for fetching packs
        http: use new http API in fetch_index()
        http*: add http_get_info_packs
        http-push.c::fetch_symref(): use the new http API
        http-push.c::remote_exists(): use the new http API
        http.c::http_fetch_ref(): use the new http API
        transport.c::get_refs_via_curl(): use the new http API
        http.c: new functions for the http API
        http: create function end_url_with_slash
        http*: move common variables and macros to http.[ch]
        transport.c::get_refs_via_curl(): do not leak refs_url
        Don't expect verify_pack() callers to set pack_size
        http-push: do not SEGV after fetching a bad pack idx file
        http*: copy string returned by sha1_to_hex
        http-walker: verify remote packs
        http-push, http-walker: style fixes
        t5550-http-fetch: test fetching of packed objects
        http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"
        http-push: send out fetch requests on queue
        ...
      e2486193
    • Junio C Hamano's avatar
      Merge branch 'cc/bisect' (early part) · cec3f989
      Junio C Hamano authored
      * 'cc/bisect' (early part):
        t6030: test skipping away from an already skipped commit
        bisect: when skipping, choose a commit away from a skipped commit
        bisect: add parameters to "filter_skipped"
        bisect: display first bad commit without forking a new process
        bisect: drop unparse_commit() and use clear_commit_marks()
      cec3f989
    • Junio C Hamano's avatar
      Merge branch 'rc/maint-http-local-slot-fix' · fa71e805
      Junio C Hamano authored
      * rc/maint-http-local-slot-fix:
        http*: cleanup slot->local after fclose
      fa71e805
    • Junio C Hamano's avatar
      Merge branch 'sp/msysgit' · 95ad2a65
      Junio C Hamano authored
      * sp/msysgit:
        compat/ has subdirectories: do not omit them in 'make clean'
        Fix typo in nedmalloc warning fix
        MinGW: Teach Makefile to detect msysgit and apply specific settings
        Fix warnings in nedmalloc when compiling with GCC 4.4.0
        Add custom memory allocator to MinGW and MacOS builds
        MinGW readdir reimplementation to support d_type
        connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
        git: browsing paths with spaces when using the start command
        MinGW: fix warning about implicit declaration of _getch()
        test-chmtime: work around Windows limitation
        Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
        Quiet make: do not leave Windows behind
        MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
      
      Conflicts:
      	Makefile
      95ad2a65
    • Junio C Hamano's avatar
      Merge branch 'cb/maint-no-double-merge' · 0a17b2cd
      Junio C Hamano authored
      * cb/maint-no-double-merge:
        refuse to merge during a merge
      0a17b2cd
    • Junio C Hamano's avatar
      Merge branch 'ph/submodule-rebase' (early part) · 7d40f891
      Junio C Hamano authored
      * 'ph/submodule-rebase' (early part):
        Rename submodule.<name>.rebase to submodule.<name>.update
        git-submodule: add support for --rebase.
      
      Conflicts:
      	Documentation/git-submodule.txt
      	git-submodule.sh
      7d40f891
    • Junio C Hamano's avatar
      Merge branch 'bc/solaris' · 436f66b7
      Junio C Hamano authored
      * bc/solaris:
        configure: test whether -lresolv is needed
        Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
        git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8
        Makefile: add section for SunOS 5.7
        Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATH
        Makefile: define __sun__ on SunOS
        git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
        On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec
        Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments
        Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall
      
      Conflicts:
      	Makefile
      436f66b7
    • Junio C Hamano's avatar
      Merge branch 'cb/match_refs_internal_tail' · 57c57a97
      Junio C Hamano authored
      * cb/match_refs_internal_tail:
        match_refs: search ref list tail internally
      57c57a97
    • Junio C Hamano's avatar
      Merge branch 'nw/maint-cvsexportcommit' · 49c7e464
      Junio C Hamano authored
      * nw/maint-cvsexportcommit:
        git-cvsexportcommit can't commit files which have been removed from CVS
      49c7e464
    • Junio C Hamano's avatar
      Merge branch 'da/araxis-mergetool' · 1bbc8204
      Junio C Hamano authored
      * da/araxis-mergetool:
        mergetool--lib: add support for araxis merge
      1bbc8204
    • Stephen Boyd's avatar
      git-rerere.txt: grammatical fixups and cleanups · c97038d1
      Stephen Boyd authored
      Rewrite the gc section using unresolved and resolved instead of "not
      recorded". Add plurals and missing articles. Make some sentences have
      consistent tense. Try and be more active by removing "that" and
      simplifying sentences.
      
      The terms "hand-resolve" and "hand resolve" were used, so just use "hand
      resolve" to be more consistent.
      Signed-off-by: default avatarStephen Boyd <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      c97038d1
  4. 12 Jun, 2009 9 commits
  5. 11 Jun, 2009 4 commits
  6. 10 Jun, 2009 4 commits
  7. 09 Jun, 2009 6 commits