aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-04 17:16:33 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-04 17:16:33 -0800
commit31cbb5d96151891491168d3f813e6898c9ef825b (patch)
treea7f3fe36377aad5251d643cfb426bac207cb003f /.gitignore
parent9bbe6db85f368fc4f75cc9f6c4bfaf2269bf0068 (diff)
parent5241b6bfe2285a6da598a0348c37b77964035bc8 (diff)
downloadgit-31cbb5d96151891491168d3f813e6898c9ef825b.tar.gz
git-31cbb5d96151891491168d3f813e6898c9ef825b.tar.xz
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 '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 916fabc6c..bac60ce31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,7 +110,6 @@ git-rev-list
git-rev-parse
git-revert
git-rm
-git-runstatus
git-send-email
git-send-pack
git-sh-setup