summaryrefslogtreecommitdiffstats
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-11 21:48:44 +0200
committerJunio C Hamano <gitster@pobox.com>2012-07-11 21:48:44 +0200
commit36c5109e4a4d455a9aa9e0f8d20c957aa6a9bef8 (patch)
tree2d746180b910cc20d7129482ca391bbe239ff980 /resolve-undo.c
parentMerge branch 'nd/clone-single-fix' into maint (diff)
parentdiff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds ch... (diff)
downloadgit-36c5109e4a4d455a9aa9e0f8d20c957aa6a9bef8.tar.xz
git-36c5109e4a4d455a9aa9e0f8d20c957aa6a9bef8.zip
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 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions