]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6a65bdc a97262c)
Merge branch 'nd/diff-with-path-params' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:15 +0000 (14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:15 +0000 (14:54 -0800)
commit02dab5d399fb276f91646d7780da90596bffefab
tree29b03cb0e3c0a2111307903c4cf1ba9d895c25d3tree | snapshot
parent6a65bdcc8c610b31fff6a171e6f49045c3980027commit | diff
parenta97262c62f1a31fcc7edf7629d313058bc7d66b5commit | diff
Merge branch 'nd/diff-with-path-params' into maint

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 diff1 | diff2 | blob | history
builtin/diff.c diff1 | diff2 | blob | history
diff-no-index.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
diff.h diff1 | diff2 | blob | history
revision.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.