summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-21 20:48:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-10-21 20:48:41 (GMT)
commit500ac7f42e7f2ae42e33be3bbb7120b788175b1d (patch)
treeae509ca36de687dd45d3a52532784f00b78daab0 /xdiff
parent20341dd970b331fd721225ca630548ec1e90d8a5 (diff)
parentd1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65 (diff)
downloadgit-500ac7f42e7f2ae42e33be3bbb7120b788175b1d.zip
git-500ac7f42e7f2ae42e33be3bbb7120b788175b1d.tar.gz
git-500ac7f42e7f2ae42e33be3bbb7120b788175b1d.tar.bz2
Merge branch 'jc/maint-reset-remove-unmerged-new'
* jc/maint-reset-remove-unmerged-new: reset --hard/read-tree --reset -u: remove unmerged new paths
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions