Merge branch 'dt/log-follow-config'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:20 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:20 +0000 (11:01 -0700)
Add a new configuration variable to enable "--follow" automatically
when "git log" is run with one pathspec argument.

* dt/log-follow-config:
  log: add "log.follow" configuration variable

1  2 
builtin/log.c
diff.c

diff --cc builtin/log.c
Simple merge
diff --cc diff.c
Simple merge