diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-26 00:50:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-28 23:13:02 -0800 |
| commit | 53228a5fb8e80f87803e4a3ba8ed25b70fb4871d (patch) | |
| tree | 0097d17996b5c71f3fb386eef354c84ffa3caaf2 /merge-index.c | |
| parent | 5a3277133d200151fe526e56e036c933d343958a (diff) | |
| download | git-53228a5fb8e80f87803e4a3ba8ed25b70fb4871d.tar.gz git-53228a5fb8e80f87803e4a3ba8ed25b70fb4871d.tar.xz | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-index.c b/merge-index.c index 727527fd5..024196e7a 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; |