allow git-am to run in a subdirectory

[git.git] / unpack-trees.h

diff --git a/unpack-trees.h b/unpack-trees.h
index 83d12295325ba234458d140c5cc718ce5176ede9..a2df544d040adc21f7d854ad50c53e61cf74c9ae 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,7 @@ struct unpack_trees_options {
        int trivial_merges_only;
        int verbose_update;
        int aggressive;
+       int skip_unmerged;
        int gently;
        const char *prefix;
        int pos;