Permalink
Commits on Oct 31, 2011
  1. Git 1.7.8-rc0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 31, 2011
  2. Merge branch 'jk/git-tricks'

    * jk/git-tricks:
      completion: match ctags symbol names in grep patterns
      contrib: add git-jump script
      contrib: add diff highlight script
    gitster committed Oct 31, 2011
Commits on Oct 27, 2011
  1. Update draft release notes to 1.7.8

    Getting very close to -rc0
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 27, 2011
  2. Merge branch 'sn/complete-bash-wo-process-subst'

    * sn/complete-bash-wo-process-subst:
      completion: fix issue with process substitution not working on Git for Windows
    gitster committed Oct 27, 2011
  3. Merge branch 'rj/gitweb-clean-js'

    * rj/gitweb-clean-js:
      gitweb/Makefile: Remove static/gitweb.js in the clean target
    gitster committed Oct 27, 2011
  4. Merge branch 'js/grep-mutex'

    * js/grep-mutex:
      builtin/grep: simplify lock_and_read_sha1_file()
      builtin/grep: make lock/unlock into static inline functions
      git grep: be careful to use mutexes only when they are initialized
    gitster committed Oct 27, 2011
  5. Merge branch 'maint'

    * maint:
      clone: Quote user supplied path in a single quote pair
      read-cache.c: fix index memory allocation
    gitster committed Oct 27, 2011
  6. Merge branch 'rs/maint-estimate-cache-size' into maint

    * rs/maint-estimate-cache-size:
      read-cache.c: fix index memory allocation
    gitster committed Oct 27, 2011
  7. clone: Quote user supplied path in a single quote pair

    Without this patch,
    
        $ git clone foo .
    
    results in this:
    
        Cloning into ....
        done.
    
    With it:
    
        Cloning into '.'...
        done.
    
    Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    RichiH committed with gitster Oct 27, 2011
Commits on Oct 26, 2011
  1. Merge branch 'maint'

    * maint:
      make the sample pre-commit hook script reject names with newlines, too
    gitster committed Oct 26, 2011
  2. Update draft release notes to 1.7.8

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 26, 2011
  3. Merge branch 'tc/submodule-clone-name-detection'

    * tc/submodule-clone-name-detection:
      submodule::module_clone(): silence die() message from module_name()
      submodule: whitespace fix
    gitster committed Oct 26, 2011
  4. Merge branch 'lh/gitweb-site-html-head'

    * lh/gitweb-site-html-head:
      gitweb: provide a way to customize html headers
    gitster committed Oct 26, 2011
  5. Merge branch 'mm/mediawiki-author-fix'

    * mm/mediawiki-author-fix:
      git-remote-mediawiki: don't include HTTP login/password in author
    gitster committed Oct 26, 2011
  6. Merge branch 'jn/libperl-git-config'

    * jn/libperl-git-config:
      Add simple test for Git::config_path() in t/t9700-perl-git.sh
      libperl-git: refactor Git::config_*
    gitster committed Oct 26, 2011
  7. Merge branch 'jm/maint-gitweb-filter-forks-fix'

    * jm/maint-gitweb-filter-forks-fix:
      gitweb: fix regression when filtering out forks
    gitster committed Oct 26, 2011
  8. Merge branch 'cn/fetch-prune'

    * cn/fetch-prune:
      fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
      fetch: honor the user-provided refspecs when pruning refs
      remote: separate out the remote_find_tracking logic into query_refspecs
      t5510: add tests for fetch --prune
      fetch: free all the additional refspecs
    
    Conflicts:
    	remote.c
    gitster committed Oct 26, 2011
  9. Merge branch 'jn/gitweb-highlite-sanitise' into maint

    * jn/gitweb-highlite-sanitise:
      gitweb: Strip non-printable characters from syntax highlighter output
    gitster committed Oct 26, 2011
  10. Merge branch 'jk/argv-array' into maint

    * jk/argv-array:
      run_hook: use argv_array API
      checkout: use argv_array API
      bisect: use argv_array API
      quote: provide sq_dequote_to_argv_array
      refactor argv_array into generic code
      quote.h: fix bogus comment
      add sha1_array API docs
    gitster committed Oct 26, 2011
  11. Merge branch 'jc/run-receive-hook-cleanup' into maint

    * jc/run-receive-hook-cleanup:
      refactor run_receive_hook()
    gitster committed Oct 26, 2011
  12. Merge branch 'cn/eradicate-working-copy' into maint

    * cn/eradicate-working-copy:
      Remove 'working copy' from the documentation and C code
    gitster committed Oct 26, 2011
  13. Merge branch 'maint-1.7.6' into maint

    * maint-1.7.6:
      notes_merge_commit(): do not pass temporary buffer to other function
      gitweb: Fix links to lines in blobs when javascript-actions are enabled
      mergetool: no longer need to save standard input
      mergetool: Use args as pathspec to unmerged files
      t9159-*.sh: skip for mergeinfo test for svn <= 1.4
      date.c: Support iso8601 timezone formats
      remote: only update remote-tracking branch if updating refspec
      remote rename: warn when refspec was not updated
      remote: "rename o foo" should not rename ref "origin/bar"
      remote: write correct fetch spec when renaming remote 'remote'
    gitster committed Oct 26, 2011
  14. Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6

    * mh/maint-notes-merge-pathbuf-fix:
      notes_merge_commit(): do not pass temporary buffer to other function
    gitster committed Oct 26, 2011
  15. Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6

    * ps/gitweb-js-with-lineno:
      gitweb: Fix links to lines in blobs when javascript-actions are enabled
    gitster committed Oct 26, 2011
  16. Merge branch 'jm/mergetool-pathspec' into maint-1.7.6

    * jm/mergetool-pathspec:
      mergetool: no longer need to save standard input
      mergetool: Use args as pathspec to unmerged files
    gitster committed Oct 26, 2011
  17. Merge branch 'mz/remote-rename' into maint-1.7.6

    * mz/remote-rename:
      remote: only update remote-tracking branch if updating refspec
      remote rename: warn when refspec was not updated
      remote: "rename o foo" should not rename ref "origin/bar"
      remote: write correct fetch spec when renaming remote 'remote'
    gitster committed Oct 26, 2011
  18. Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6

    * rj/maint-t9159-svn-rev-notation:
      t9159-*.sh: skip for mergeinfo test for svn <= 1.4
    gitster committed Oct 26, 2011
  19. Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6

    * hl/iso8601-more-zone-formats:
      date.c: Support iso8601 timezone formats
    gitster committed Oct 26, 2011
  20. Merge branch 'maint-1.7.6' into maint

    * maint-1.7.6:
      make the sample pre-commit hook script reject names with newlines, too
      git-read-tree.txt: update sparse checkout examples
      git-read-tree.txt: correct sparse-checkout and skip-worktree description
      git-read-tree.txt: language and typography fixes
      unpack-trees: print "Aborting" to stderr
      Documentation/git-update-index: refer to 'ls-files'
      Documentation: basic configuration of notes.rewriteRef
    gitster committed Oct 26, 2011
  21. Merge branch 'tr/doc-note-rewrite' into maint-1.7.6

    * tr/doc-note-rewrite:
      Documentation: basic configuration of notes.rewriteRef
    gitster committed Oct 26, 2011
  22. Merge branch 'nd/sparse-doc' into maint-1.7.6

    * nd/sparse-doc:
      git-read-tree.txt: update sparse checkout examples
    gitster committed Oct 26, 2011
  23. Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6

    * mg/maint-doc-sparse-checkout:
      git-read-tree.txt: correct sparse-checkout and skip-worktree description
      git-read-tree.txt: language and typography fixes
      unpack-trees: print "Aborting" to stderr
    gitster committed Oct 26, 2011
  24. Merge branch 'maint-1.7.5' into maint-1.7.6

    * maint-1.7.5:
      make the sample pre-commit hook script reject names with newlines, too
      Reindent closing bracket using tab instead of spaces
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011
  25. Merge branch 'maint-1.7.4' into maint-1.7.5

    * maint-1.7.4:
      make the sample pre-commit hook script reject names with newlines, too
      Reindent closing bracket using tab instead of spaces
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011
  26. Merge branch 'maint-1.7.3' into maint-1.7.4

    * maint-1.7.3:
      make the sample pre-commit hook script reject names with newlines, too
      Reindent closing bracket using tab instead of spaces
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011