git/git-commit.sh, branch v1.5.3-rc2

Remove useless uses of cat, and replace with filename arguments

2007-07-14T08:07:44Z

Replace uses of cat that do nothing but writing the contents of a single file to another command via pipe. [jc: Original patch from Josh was somewhat buggy and rewrote "cat $file | wc -l" to "wc -l $file", but this one should be Ok.] Signed-off-by: Junio C Hamano

git-commit: don't add multiple Signed-off-by: from the same identity

2007-07-09T01:24:19Z

If requested to signoff a commit, don't add another Signed-off-by: line to the commit message if the exact same line is already there. This was noticed and requested by Josh Triplett through http://bugs.debian.org/430851 Signed-off-by: Gerrit Pape Signed-off-by: Junio C Hamano

Enable "git rerere" by the config variable rerere.enabled

2007-07-07T05:39:15Z

Earlier, "git rerere" was enabled by creating the directory .git/rr-cache. That is definitely not in line with most other features, which are enabled by a config variable. So, check the config variable "rerere.enabled". If it is set to "false" explicitely, do not activate rerere, even if .git/rr-cache exists. This should help when you want to disable rerere temporarily. If "rerere.enabled" is not set at all, fall back to detection of the directory .git/rr-cache. [jc: with minimum tweaks] Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Rewrite "git-frotz" to "git frotz"

2007-07-03T05:52:14Z

This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano

Move the pick_author code to git-sh-setup

2007-06-25T00:45:01Z

At the moment, only git-commit uses that code, to pick the author name, email and date from a given commit. This code will be reused in git rebase --interactive. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

War on whitespace

2007-06-07T07:04:01Z

This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano

Merge branch 'maint-1.5.1' into maint

2007-05-26T08:30:40Z

* maint-1.5.1: Fix git-svn to handle svn not reporting the md5sum of a file, and test. More echo "$user_message" fixes. Add tests for the last two fixes. git-commit: use printf '%s\n' instead of echo on user-supplied strings git-am: use printf instead of echo on user-supplied strings Documentation: Add definition of "evil merge" to GIT Glossary Replace the last 'dircache's by 'index' Documentation: Clean up links in GIT Glossary

git-commit: use printf '%s\n' instead of echo on user-supplied strings

2007-05-26T07:23:23Z

This fixes the same issue git-am had, which was fixed by Jeff King in the previous commit. Cleverly enough, this commit's log message is a good test case at the same time. Signed-off-by: Junio C Hamano

Display the subject of the commit just made.

2007-04-16T08:06:00Z

Useful e.g. to figure out what I did from screen history, or to make sure subject line is short enough and makes sense on its own. Signed-off-by: Michael S. Tsirkin Signed-off-by: Junio C Hamano

git-read-tree --index-output=

2007-04-04T06:44:32Z

This corrects the interface mistake of the previous one, and gives a command line parameter to the only plumbing command that currently needs it: "git-read-tree". We can add the calls to set_alternate_index_output() to other plumbing commands that update the index if/when needed. Signed-off-by: Junio C Hamano