summaryrefslogtreecommitdiff
path: root/builtin/diff-files.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-27 11:36:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-27 11:36:42 -0700
commit65bc83d704b82b613f1f61b4ad97412376ab4a69 (patch)
treea1189866640355a5a77a11bc8132f6cee4482139 /builtin/diff-files.c
parentMerge branch 'rj/sparse' (diff)
parentstash: ensure --no-keep-index and --patch can be used in any order (diff)
downloadtgif-65bc83d704b82b613f1f61b4ad97412376ab4a69.tar.xz
Merge branch 'dm/stash-k-i-p'
* dm/stash-k-i-p: stash: ensure --no-keep-index and --patch can be used in any order stash: add two more tests for --no-keep-index
Diffstat (limited to 'builtin/diff-files.c')
0 files changed, 0 insertions, 0 deletions