summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-26 08:50:02 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-29 07:13:02 (GMT)
commit53228a5fb8e80f87803e4a3ba8ed25b70fb4871d (patch)
tree0097d17996b5c71f3fb386eef354c84ffa3caaf2 /merge-index.c
parent5a3277133d200151fe526e56e036c933d343958a (diff)
downloadgit-53228a5fb8e80f87803e4a3ba8ed25b70fb4871d.zip
git-53228a5fb8e80f87803e4a3ba8ed25b70fb4871d.tar.gz
git-53228a5fb8e80f87803e4a3ba8ed25b70fb4871d.tar.bz2
Make the rest of commands work from a subdirectory.
These commands are converted to run from a subdirectory. commit-tree convert-objects merge-base merge-index mktag pack-objects pack-redundant prune-packed read-tree tar-tree unpack-file unpack-objects update-server-info write-tree Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-index.c')
-rw-r--r--merge-index.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-index.c b/merge-index.c
index 727527f..024196e 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] <merge-program> (-a | <filename>*)");
+ setup_git_directory();
read_cache();
i = 1;