author | Junio C Hamano <gitster@pobox.com> | |
Wed, 5 Dec 2007 01:16:33 +0000 (17:16 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 5 Dec 2007 01:16:33 +0000 (17:16 -0800) | ||
commit | 31cbb5d96151891491168d3f813e6898c9ef825b | |
tree | a7f3fe36377aad5251d643cfb426bac207cb003f | tree | snapshot |
parent | 9bbe6db85f368fc4f75cc9f6c4bfaf2269bf0068 | commit | diff |
parent | 5241b6bfe2285a6da598a0348c37b77964035bc8 | commit | diff |
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.
...
* 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.
...
12 files changed:
.gitignore | diff1 | | diff2 | | blob | history |
Makefile | diff1 | | diff2 | | blob | history |
builtin-tag.c | diff1 | | diff2 | | blob | history |
builtin.h | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
contrib/examples/git-commit.sh | | | diff2 | | blob | history |
dir.c | diff1 | | diff2 | | blob | history |
git.c | diff1 | | diff2 | | blob | history |
ident.c | diff1 | | diff2 | | blob | history |
t/t4001-diff-rename.sh | diff1 | | diff2 | | blob | history |
t/t7501-commit.sh | diff1 | | diff2 | | blob | history |
wt-status.c | diff1 | | diff2 | | blob | history |