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)
commit02dab5d...99fb276f91646d7780da90596bffefab
tree29b03cb...e3c0a2111307903c4cf1ba9d895c25d3copy hash to clipboard (tree)
parent6a65bdc...8c610b31fff6a171e6f49045c3980027copy hash to clipboard (diff)
parenta97262c...2f1a31fcc7edf7629d313058bc7d66b5copy hash to clipboard (diff)
builtin/am.c
builtin/diff.c
diff-no-index.c
diff.c
diff.h
revision.c