1. 27 Jun, 2010 5 commits
  2. 03 Jun, 2010 1 commit
  3. 02 Jun, 2010 4 commits
  4. 01 Jun, 2010 3 commits
  5. 29 May, 2010 1 commit
  6. 28 May, 2010 5 commits
  7. 25 May, 2010 5 commits
  8. 21 May, 2010 16 commits
    • Junio C Hamano's avatar
      Merge branch 'by/blame-doc-m-c' · 770c5417
      Junio C Hamano authored
      * by/blame-doc-m-c:
        blame-options.txt: Add default value for `-M/-C` options.
      770c5417
    • Junio C Hamano's avatar
      Merge branch 'by/log-follow' · 82c531b3
      Junio C Hamano authored
      * by/log-follow:
        tests: rename duplicate t4205
        Make git log --follow find copies among unmodified files.
        Make diffcore_std only can run once before a diff_flush
        Add a macro DIFF_QUEUE_CLEAR.
      82c531b3
    • Junio C Hamano's avatar
      Merge branch 'mg/advice-statushints' · 82e7ee73
      Junio C Hamano authored
      * mg/advice-statushints:
        wt-status: take advice.statusHints seriously
        t7508: test advice.statusHints
      
      Conflicts:
      	wt-status.c
      82e7ee73
    • Junio C Hamano's avatar
      Merge branch 'cb/maint-stash-orphaned-file' · b7ef48d5
      Junio C Hamano authored
      * cb/maint-stash-orphaned-file:
        stash tests: stash can lose data in a file removed from the index
        stash: Don't overwrite files that have gone from the index
      b7ef48d5
    • Junio C Hamano's avatar
      Merge branch 'jn/maint-bundle' · dfe0171c
      Junio C Hamano authored
      * jn/maint-bundle:
        fix "bundle --stdin" segfault
        t5704 (bundle): add tests for bundle --stdin
      dfe0171c
    • Junio C Hamano's avatar
      Merge branch 'pb/patch-id-plus' · 4d544948
      Junio C Hamano authored
      * pb/patch-id-plus:
        patch-id: Add support for mbox format
        patch-id: extract parsing one diff out of generate_id_list
      4d544948
    • Junio C Hamano's avatar
      Merge branch 'rr/doc-submitting' · c00cf45f
      Junio C Hamano authored
      * rr/doc-submitting:
        SubmittingPatches: Add new section about what to base work on
      c00cf45f
    • Junio C Hamano's avatar
      Merge branch 'st/remote-tags-no-tags' · 42779124
      Junio C Hamano authored
      * st/remote-tags-no-tags:
        remote add: add a --[no-]tags option
        Honor "tagopt = --tags" configuration option
      42779124
    • Junio C Hamano's avatar
      Merge branch 'jn/fsck-ident' · 4cbf42e1
      Junio C Hamano authored
      * jn/fsck-ident:
        fsck: check ident lines in commit objects
      4cbf42e1
    • Junio C Hamano's avatar
      Merge branch 'jn/gitweb-caching-prep' · 921296d3
      Junio C Hamano authored
      * jn/gitweb-caching-prep:
        gitweb: Move generating page title to separate subroutine
        gitweb: Add custom error handler using die_error
        gitweb: Use nonlocal jump instead of 'exit' in die_error
        gitweb: href(..., -path_info => 0|1)
        Export more test-related variables when running external tests
      921296d3
    • Junio C Hamano's avatar
      Merge branch 'jn/gitweb-install' · 14b8512f
      Junio C Hamano authored
      * jn/gitweb-install:
        gitweb: Create install target for gitweb in Makefile
        gitweb: Improve installation instructions in gitweb/INSTALL
      14b8512f
    • Junio C Hamano's avatar
      Merge branch 'jn/gitweb-our-squelch' · 71f1d729
      Junio C Hamano authored
      * jn/gitweb-our-squelch:
        gitweb: Silence 'Variable VAR may be unavailable' warnings
      71f1d729
    • Junio C Hamano's avatar
      Merge branch 'jn/request-pull' · 3b65270d
      Junio C Hamano authored
      * jn/request-pull:
        tests: chmod +x t5150
        adapt request-pull tests for new pull request format
        t5150: protect backslash with backslash in shell
        request-pull: protect against OPTIONS_KEEPDASHDASH from environment
        tests for request-pull
      3b65270d
    • Junio C Hamano's avatar
      Merge branch 'jn/shortlog' · 8e3bc145
      Junio C Hamano authored
      * jn/shortlog:
        pretty: Respect --abbrev option
        shortlog: Document and test --format option
        t4201 (shortlog): Test output format with multiple authors
        t4201 (shortlog): guard setup with test_expect_success
        Documentation/shortlog: scripted users should not rely on implicit HEAD
      8e3bc145
    • Junio C Hamano's avatar
      Merge branch 'jn/t7006-fixup' · f9a518e8
      Junio C Hamano authored
      * jn/t7006-fixup:
        t7006: guard cleanup with test_expect_success
      f9a518e8
    • Junio C Hamano's avatar
      Merge branch 'js/maint-receive-pack-symref-alias' · 9215f76f
      Junio C Hamano authored
      * js/maint-receive-pack-symref-alias:
        t5516-fetch-push.sh: style cleanup
        receive-pack: detect aliased updates which can occur with symrefs
        receive-pack: switch global variable 'commands' to a parameter
      
      Conflicts:
      	t/t5516-fetch-push.sh
      9215f76f