Junio C Hamano a160ff122c Merge branch 'by/line-log' into next ...

* by/line-log:
  Document line history browser
  Add tests for line history browser
  Add --full-line-diff option
  Add --graph prefix before line history output
  Add parent rewriting to line history browser
  Make graph_next_line external to other part of git
  Make rewrite_parents public to other part of git
  Hook line history into cmd_log, ensuring a topo-ordered walk
  Print the line log
  map/take range to the parent of commits
  Add range clone functions
  Export three functions from diff.c
  Parse the -L options
  Refactor parse_loc
  Add the basic data structure for line level history
  parse-options: add two helper functions
  parse-options: enhance STOP_AT_NON_OPTION

Conflicts:
	builtin/log.c

2010-08-26 16:43:36 -07:00

11 KiB

Raw Blame History

View Raw