X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=merge-index.c;h=024196e7ac53cb9ad09b38ea646bad81aff33306;hb=41292ddd37202ff6dce34986c87a6000c5d3fbfa;hp=727527fd59480a11a563108fa5d55a2696a40e98;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git diff --git a/merge-index.c b/merge-index.c index 727527fd..024196e7 100644 --- a/merge-index.c +++ b/merge-index.c @@ -102,6 +102,7 @@ int main(int argc, char **argv) if (argc < 3) usage("git-merge-index [-o] [-q] (-a | *)"); + setup_git_directory(); read_cache(); i = 1;