summaryrefslogtreecommitdiff
path: root/t/t3409-rebase-preserve-merges.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-11 12:48:44 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-11 12:48:44 -0700
commit36c5109e4a4d455a9aa9e0f8d20c957aa6a9bef8 (patch)
tree2d746180b910cc20d7129482ca391bbe239ff980 /t/t3409-rebase-preserve-merges.sh
parent4ac01b0cbc27b314333362e77323850e78a7448c (diff)
parent304970dd5d9e542e70eca98932c1e9f26770678e (diff)
downloadgit-36c5109e4a4d455a9aa9e0f8d20c957aa6a9bef8.tar.gz
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
Diffstat (limited to 't/t3409-rebase-preserve-merges.sh')
0 files changed, 0 insertions, 0 deletions