author | Junio C Hamano <gitster@pobox.com> | |
Tue, 21 Oct 2008 20:48:41 +0000 (13:48 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 21 Oct 2008 20:48:41 +0000 (13:48 -0700) | ||
commit | 500ac7f42e7f2ae42e33be3bbb7120b788175b1d | |
tree | ae509ca36de687dd45d3a52532784f00b78daab0 | tree | snapshot |
parent | 20341dd970b331fd721225ca630548ec1e90d8a5 | commit | diff |
parent | d1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65 | commit | diff |
Merge branch 'jc/maint-reset-remove-unmerged-new'
* jc/maint-reset-remove-unmerged-new:
reset --hard/read-tree --reset -u: remove unmerged new paths
* jc/maint-reset-remove-unmerged-new:
reset --hard/read-tree --reset -u: remove unmerged new paths
read-cache.c | diff1 | | diff2 | | blob | history |