diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:09 -0700 |
| commit | 66d2c22f416cda652f08e8db5820abf3e87592e5 (patch) | |
| tree | ad4e5e2e38eec22aa6cb769e5d2d1dd896b19629 /resolve-undo.c | |
| parent | a9af6c451d68267a605b7b7385cdffa939b167b2 (diff) | |
| parent | 0a1283bc3955a97557019d077b96669c5c93c551 (diff) | |
| download | git-66d2c22f416cda652f08e8db5820abf3e87592e5.tar.gz | |
Merge branch 'jc/checkout-from-tree-keep-local-changes'
* jc/checkout-from-tree-keep-local-changes:
checkout $tree $path: do not clobber local changes in $path not in $tree
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions