summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-21 08:34:54 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-21 08:34:54 (GMT)
commit328b710d800dc3786fe2b8595e5553dc4a4af424 (patch)
tree451935aff364f1fd65340dbb79242780f04ea87a /git.c
parente686eb9870d6b382f0760e3e859e93c8c2dfb31b (diff)
parent8824689884a5673f803d77cda499f83b84145a06 (diff)
downloadgit-328b710d800dc3786fe2b8595e5553dc4a4af424.zip
git-328b710d800dc3786fe2b8595e5553dc4a4af424.tar.gz
git-328b710d800dc3786fe2b8595e5553dc4a4af424.tar.bz2
Merge branch 'master' into js/fmt-patch
* master: (119 commits) diff family: add --check option Document that "git add" only adds non-ignored files. Add a conversion tool to migrate remote information into the config fetch, pull: ask config for remote information Fix build procedure for builtin-init-db read-tree -m -u: do not overwrite or remove untracked working tree files. apply --cached: do not check newly added file in the working tree Implement a --dry-run option to git-quiltimport Implement git-quiltimport Revert "builtin-grep: workaround for non GNU grep." builtin-grep: workaround for non GNU grep. builtin-grep: workaround for non GNU grep. git-am: use apply --cached apply --cached: apply a patch without using working tree. apply --numstat: show new name, not old name. Documentation/Makefile: create tarballs for the man pages and html files Allow pickaxe and diff-filter options to be used by git log. Libify the index refresh logic Builtin git-init-db Remove unnecessary local in get_ref_sha1. ...
Diffstat (limited to 'git.c')
-rw-r--r--git.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/git.c b/git.c
index a8f7926..f4dff02 100644
--- a/git.c
+++ b/git.c
@@ -50,6 +50,10 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "fmt-patch", cmd_format_patch },
{ "count-objects", cmd_count_objects },
{ "diff", cmd_diff },
+ { "grep", cmd_grep },
+ { "rev-list", cmd_rev_list },
+ { "init-db", cmd_init_db },
+ { "check-ref-format", cmd_check_ref_format }
};
int i;