diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-16 00:49:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-16 00:49:59 -0700 |
| commit | 578421fbd8db6602f290862f44843fc896b4fb0b (patch) | |
| tree | 9d83cfd1e69665eca96d2fd3b69845efdea5dca3 /unpack-trees.h | |
| parent | 8e909f80b41d1a14adede05b4a31f2f2caa56e55 (diff) | |
| parent | 5521883490e85f4d973141972cf16f89a79f1979 (diff) | |
| download | git-578421fbd8db6602f290862f44843fc896b4fb0b.tar.gz | |
Merge branch 'jc/maint-checkout-keep-remove'
* jc/maint-checkout-keep-remove:
checkout: do not lose staged removal
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 94e567265a..0d26f3d73e 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -26,6 +26,7 @@ struct unpack_trees_options { verbose_update:1, aggressive:1, skip_unmerged:1, + initial_checkout:1, gently:1; const char *prefix; int pos; |