diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-05 01:16:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-05 01:16:33 (GMT) |
| commit | 31cbb5d96151891491168d3f813e6898c9ef825b (patch) | |
| tree | a7f3fe36377aad5251d643cfb426bac207cb003f /git.c | |
| parent | 9bbe6db85f368fc4f75cc9f6c4bfaf2269bf0068 (diff) | |
| parent | 5241b6bfe2285a6da598a0348c37b77964035bc8 (diff) | |
| download | git-31cbb5d96151891491168d3f813e6898c9ef825b.zip git-31cbb5d96151891491168d3f813e6898c9ef825b.tar.gz git-31cbb5d96151891491168d3f813e6898c9ef825b.tar.bz2 | |
Merge branch 'kh/commit'
* kh/commit: (33 commits)
git-commit --allow-empty
git-commit: Allow to amend a merge commit that does not change the tree
quote_path: fix collapsing of relative paths
Make git status usage say git status instead of git commit
Fix --signoff in builtin-commit differently.
git-commit: clean up die messages
Do not generate full commit log message if it is not going to be used
Remove git-status from list of scripts as it is builtin
Fix off-by-one error when truncating the diff out of the commit message.
builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well.
Add a few more tests for git-commit
builtin-commit: Include the diff in the commit message when verbose.
builtin-commit: fix partial-commit support
Fix add_files_to_cache() to take pathspec, not user specified list of files
Export three helper functions from ls-files
builtin-commit: run commit-msg hook with correct message file
builtin-commit: do not color status output shown in the message template
file_exists(): dangling symlinks do exist
Replace "runstatus" with "status" in the tests
t7501-commit: Add test for git commit <file> with dirty index.
...
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -294,6 +294,7 @@ static void handle_internal_command(int argc, const char **argv) { "cherry", cmd_cherry, RUN_SETUP }, { "cherry-pick", cmd_cherry_pick, RUN_SETUP | NEED_WORK_TREE }, { "clean", cmd_clean, RUN_SETUP | NEED_WORK_TREE }, + { "commit", cmd_commit, RUN_SETUP | NEED_WORK_TREE }, { "commit-tree", cmd_commit_tree, RUN_SETUP }, { "config", cmd_config }, { "count-objects", cmd_count_objects, RUN_SETUP }, @@ -346,11 +347,11 @@ static void handle_internal_command(int argc, const char **argv) { "rev-parse", cmd_rev_parse }, { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE }, { "rm", cmd_rm, RUN_SETUP }, - { "runstatus", cmd_runstatus, RUN_SETUP | NEED_WORK_TREE }, { "send-pack", cmd_send_pack, RUN_SETUP }, { "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER }, { "show-branch", cmd_show_branch, RUN_SETUP }, { "show", cmd_show, RUN_SETUP | USE_PAGER }, + { "status", cmd_status, RUN_SETUP | NEED_WORK_TREE }, { "stripspace", cmd_stripspace }, { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP }, { "tag", cmd_tag, RUN_SETUP }, |