diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:24 -0700 |
| commit | df6840855d24c2f54c0b8a66cbac33d8af43333a (patch) | |
| tree | 355715d1b644e9fd88307485c424dfadcdae7e81 /builtin/apply.c | |
| parent | 634b29d2705af2e05d593b75ade2be64033468a5 (diff) | |
| parent | 0a1283bc3955a97557019d077b96669c5c93c551 (diff) | |
| download | git-df6840855d24c2f54c0b8a66cbac33d8af43333a.tar.gz | |
Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint
* jc/checkout-from-tree-keep-local-changes:
checkout $tree $path: do not clobber local changes in $path not in $tree
Diffstat (limited to 'builtin/apply.c')
0 files changed, 0 insertions, 0 deletions