aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-16 00:49:59 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-16 00:49:59 -0700
commit578421fbd8db6602f290862f44843fc896b4fb0b (patch)
tree9d83cfd1e69665eca96d2fd3b69845efdea5dca3 /diff.c
parentMerge branch 'jc/maint-diff-quiet' (diff)
parentcheckout: do not lose staged removal (diff)
downloadgit-578421fbd8db6602f290862f44843fc896b4fb0b.tar.gz
git-578421fbd8db6602f290862f44843fc896b4fb0b.zip
Merge branch 'jc/maint-checkout-keep-remove'
* jc/maint-checkout-keep-remove: checkout: do not lose staged removal
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions