Merge branch 'nd/diff-with-path-params'
commitc167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Feb 2016 22:16:04 +0000 (3 14:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Feb 2016 22:16:04 +0000 (3 14:16 -0800)
tree9cd4964f51f8c32133d5e5cce34bedd86e11ee4d
parent465c30a9c6f68c3bac25cd875624286baa37b41c
parenta97262c62f1a31fcc7edf7629d313058bc7d66b5
Merge branch 'nd/diff-with-path-params'

A few options of "git diff" did not work well when the command was
run from a subdirectory.

* nd/diff-with-path-params:
  diff: make -O and --output work in subdirectory
  diff-no-index: do not take a redundant prefix argument
builtin/am.c
builtin/diff.c
diff-no-index.c
diff.c
diff.h
revision.c