projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4ac01b0 304970d)
Merge branch 'th/diff-no-index-fixes' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:48:44 +0000 (12:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:48:44 +0000 (12:48 -0700)
commit36c5109e4a4d455a9aa9e0f8d20c957aa6a9bef8
tree2d746180b910cc20d7129482ca391bbe239ff980tree | snapshot
parent4ac01b0cbc27b314333362e77323850e78a7448ccommit | diff
parent304970dd5d9e542e70eca98932c1e9f26770678ecommit | diff
Merge branch 'th/diff-no-index-fixes' into maint

"git diff --no-index" did not correctly handle relative paths and
did not correctly give exit codes when run under "--quiet" option.

* th/diff-no-index-fixes:
  diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
  diff: handle relative paths in no-index
cache.h diff1 | diff2 | blob | history
diff-no-index.c diff1 | diff2 | blob | history
setup.c diff1 | diff2 | blob | history
Git—the stupid content tracker