Merge branch 'tr/line-log'
commited73fe56428eecd2b635473f6a517a183c4713a3
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Jun 2013 23:00:44 +0000 (2 16:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Jun 2013 23:00:44 +0000 (2 16:00 -0700)
tree42b21a016eca79cfee341a1bc0dbf5118acdb01e
parent4de1179afcb1105a43cf167b513afda42c4f152d
parent499926670665570d785bc7baca4d7cd4420823dc
Merge branch 'tr/line-log'

* tr/line-log:
  git-log(1): remove --full-line-diff description
  line-log: fix documentation formatting
  log -L: improve comments in process_all_files()
  log -L: store the path instead of a diff_filespec
  log -L: test merge of parallel modify/rename
  t4211: pass -M to 'git log -M -L...' test
  log -L: fix overlapping input ranges
  log -L: check range set invariants when we look it up
  Speed up log -L... -M
  log -L: :pattern:file syntax to find by funcname
  Implement line-history search (git log -L)
  Export rewrite_parents() for 'log -L'
  Refactor parse_loc
Documentation/git-log.txt
Makefile
builtin/blame.c
builtin/log.c
log-tree.c
revision.c
revision.h