diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-02-15 05:18:01 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-02-15 05:18:01 +0100 |
| commit | a291790a8d42579dafe8684151931847921a9578 (patch) | |
| tree | 52d422ca59797b58ec3bf6858d0d9a4af8156346 /include/git2 | |
| parent | a7fa970f8b216b79a5d237a9d87ac88e2371ae46 (diff) | |
| parent | 41fae48df21c7d1140da539cb61fa3fd0598a3e7 (diff) | |
| download | libgit2-a291790a8d42579dafe8684151931847921a9578.tar.gz | |
Merge pull request #2831 from ethomson/merge_lock
merge: lock index during the merge (not just checkout)
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/checkout.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/git2/checkout.h b/include/git2/checkout.h index 8314c623d..4fe1340b9 100644 --- a/include/git2/checkout.h +++ b/include/git2/checkout.h @@ -135,7 +135,10 @@ typedef enum { /** Only update existing files, don't create new ones */ GIT_CHECKOUT_UPDATE_ONLY = (1u << 7), - /** Normally checkout updates index entries as it goes; this stops that */ + /** + * Normally checkout updates index entries as it goes; this stops that. + * Implies `GIT_CHECKOUT_DONT_WRITE_INDEX`. + */ GIT_CHECKOUT_DONT_UPDATE_INDEX = (1u << 8), /** Don't refresh index/config/etc before doing checkout */ @@ -166,6 +169,9 @@ typedef enum { /** Don't overwrite existing files or folders */ GIT_CHECKOUT_DONT_REMOVE_EXISTING = (1u << 22), + /** Normally checkout writes the index upon completion; this prevents that. */ + GIT_CHECKOUT_DONT_WRITE_INDEX = (1u << 23), + /** * THE FOLLOWING OPTIONS ARE NOT YET IMPLEMENTED */ |