Junio C Hamano 7a7d87d7d3 Merge branch 'master' into next ...

* master:
  Documentation: add submodule.* to the big configuration variable list
  gitmodules.5: url can be a relative path
  gitweb: fix esc_url
  git --paginate: paginate external commands again
  MERGE_RR is in .git, not .git/rr-cache
  merge-tree: fix where two branches share no changes
  add basic tests for merge-tree
  merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
  git --paginate: do not commit pager choice too early
  tests: local config file should be honored from subdirs of toplevel
  t7006: test pager configuration for several git commands
  t7006 (pager): introduce helper for parameterized tests

2010-07-15 12:09:48 -07:00

41 KiB

Raw Blame History

View Raw