1. 26 Jun, 2015 2 commits
  2. 23 Jun, 2015 1 commit
  3. 18 Jun, 2015 1 commit
  4. 16 Jun, 2015 22 commits
  5. 14 Jun, 2015 1 commit
  6. 12 Jun, 2015 4 commits
  7. 11 Jun, 2015 9 commits
    • Junio C Hamano's avatar
      Second half of seventh batch · a5fe6680
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      a5fe6680
    • Junio C Hamano's avatar
      Merge branch 'tb/complete-sequencing' · e356158b
      Junio C Hamano authored
      The bash completion script (in contrib/) learned a few options that
      "git revert" takes.
      
      * tb/complete-sequencing:
        completion: suggest sequencer commands for revert
      e356158b
    • Junio C Hamano's avatar
      Merge branch 'jk/squelch-missing-link-warning-for-unreachable' · 43262d8d
      Junio C Hamano authored
      Recent "git prune" traverses young unreachable objects to safekeep
      old objects in the reachability chain from them, which sometimes
      caused error messages that are unnecessarily alarming.
      
      * jk/squelch-missing-link-warning-for-unreachable:
        suppress errors on missing UNINTERESTING links
        silence broken link warnings with revs->ignore_missing_links
        add quieter versions of parse_{tree,commit}
      43262d8d
    • Junio C Hamano's avatar
      Merge branch 'pt/pull-tests' · 0e04b248
      Junio C Hamano authored
      Add more test coverage to "git pull".
      
      * pt/pull-tests:
        t5520: check reflog action in fast-forward merge
        t5521: test --dry-run does not make any changes
        t5520: test --rebase failure on unborn branch with index
        t5520: test --rebase with multiple branches
        t5520: test work tree fast-forward when fetch updates head
        t5520: test for failure if index has unresolved entries
        t5520: test no merge candidates cases
        t5520: prevent field splitting in content comparisons
      0e04b248
    • Junio C Hamano's avatar
      Merge branch 'sb/glossary-submodule' · c491e9e4
      Junio C Hamano authored
      * sb/glossary-submodule:
        glossary: add "remote", "submodule", "superproject"
      c491e9e4
    • Junio C Hamano's avatar
      Merge branch 'sb/submodule-doc-intro' · 7df5c978
      Junio C Hamano authored
      * sb/submodule-doc-intro:
        submodule doc: reorder introductory paragraphs
      7df5c978
    • Junio C Hamano's avatar
      Merge branch 'jk/diagnose-config-mmap-failure' · dee47925
      Junio C Hamano authored
      The configuration reader/writer uses mmap(2) interface to access
      the files; when we find a directory, it barfed with "Out of memory?".
      
      * jk/diagnose-config-mmap-failure:
        xmmap(): drop "Out of memory?"
        config.c: rewrite ENODEV into EISDIR when mmap fails
        config.c: avoid xmmap error messages
        config.c: fix mmap leak when writing config
        read-cache.c: drop PROT_WRITE from mmap of index
      dee47925
    • Junio C Hamano's avatar
      Merge branch 'mt/p4-depotFile-at-version' · 8f436d13
      Junio C Hamano authored
      * mt/p4-depotFile-at-version:
        p4: retrieve the right revision of the file in UTF-16 codepath
      8f436d13
    • Junio C Hamano's avatar
      Merge branch 'mh/verify-lock-error-report' · 829f03e9
      Junio C Hamano authored
      Bring consistency to error reporting mechanism used in "refs" API.
      
      * mh/verify-lock-error-report:
        ref_transaction_commit(): do not capitalize error messages
        verify_lock(): do not capitalize error messages
        verify_lock(): report errors via a strbuf
        verify_lock(): on errors, let the caller unlock the lock
        verify_lock(): return 0/-1 rather than struct ref_lock *
      829f03e9