diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-10-21 13:48:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-21 13:48:41 -0700 |
| commit | 500ac7f42e7f2ae42e33be3bbb7120b788175b1d (patch) | |
| tree | ae509ca36de687dd45d3a52532784f00b78daab0 /builtin-merge-recursive.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | reset --hard/read-tree --reset -u: remove unmerged new paths (diff) | |
| download | tgif-500ac7f42e7f2ae42e33be3bbb7120b788175b1d.tar.xz | |
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 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions