Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 20, 2011
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      git-mergetool: check return value from read
Commits on Jun 30, 2011
  1. @gitster

    Merge branch 'da/git-prefix-everywhere' into next

    gitster authored
    * da/git-prefix-everywhere:
      t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
      git-mergetool--lib: Make vimdiff retain the current directory
      git: Remove handling for GIT_PREFIX
      setup: Provide GIT_PREFIX to built-ins
Commits on Mar 20, 2011
  1. @gitster

    Merge branch 'ss/mergetool--lib'

    gitster authored
    * ss/mergetool--lib:
      mergetool--lib: Add Beyond Compare 3 as a tool
      mergetool--lib: Sort tools alphabetically for easier lookup
Commits on Nov 25, 2009
  1. @gitster

    Merge branch 'rs/work-around-grep-opt-insanity'

    gitster authored
    * rs/work-around-grep-opt-insanity:
      Protect scripted Porcelains from GREP_OPTIONS insanity
      mergetool--lib: simplify guess_merge_tool()
    
    Conflicts:
    	git-instaweb.sh
Something went wrong with that request. Please try again.