git/git-commit.sh, branch v1.5.2

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

_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.

2007-04-04T06:44:32Z

When defined, this allows plumbing commands that update the index (add, apply, checkout-index, merge-recursive, mv, read-tree, rm, update-index, and write-tree) to write their resulting index to an alternative index file while holding a lock to the original index file. With this, git-commit that jumps the index does not have to make an extra copy of the index file, and more importantly, it can do the update while holding the lock on the index. However, I think the interface to let an environment variable specify the output is a mistake, as shown in the documentation. If a curious user has the environment variable set to something other than the file GIT_INDEX_FILE points at, almost everything will break. This should instead be a command line parameter to tell these plumbing commands to write the result in the named file, to prevent stupid mistakes. Signed-off-by: Junio C Hamano

Merge branch 'maint' to synchronize with 1.5.0.6

2007-03-28T22:39:57Z

git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly

2007-03-28T10:34:55Z

It still looks at the working tree and checks for locally modified paths. When are preparing a temporary index from HEAD, we do not want any of that. Signed-off-by: Junio C Hamano

git-commit: add a --interactive option

2007-03-09T08:05:23Z

The --interactive option behaves like "git commit", except that "git add --interactive" is executed before committing. It is incompatible with -a and -i. Signed-off-by: Paolo Bonzini Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-03-06T07:11:54Z

* maint: git-commit: cd to top before showing the final stat

git-commit: cd to top before showing the final stat

2007-03-06T07:11:19Z

Signed-off-by: Junio C Hamano

Merge branch 'master' into js/diff-ni

2007-02-26T09:20:42Z

* master: (201 commits) Documentation: link in 1.5.0.2 material to the top documentation page. Documentation: document remote..tagopt GIT 1.5.0.2 git-remote: support remotes with a dot in the name Documentation: describe "-f/-t/-m" options to "git-remote add" diff --cc: fix display of symlink conflicts during a merge. merge-recursive: fix longstanding bug in merging symlinks merge-index: fix longstanding bug in merging symlinks diff --cached: give more sensible error message when HEAD is yet to be created. Update tests to use test-chmtime Add test-chmtime: a utility to change mtime on files Add Release Notes to prepare for 1.5.0.2 Allow arbitrary number of arguments to git-pack-objects rerere: do not deal with symlinks. rerere: do not skip two conflicted paths next to each other. Don't modify CREDITS-FILE if it hasn't changed. diff-patch: Avoid emitting double-slashes in textual patch. Reword git-am 3-way fallback failure message. Limit filename for format-patch core.legacyheaders: Use the description used in RelNotes-1.5.0 ...

Fix 'git commit -a' in a newly initialized repository

2007-02-23T05:02:39Z

With current git: $ git init $ git commit -a cp: cannot stat `.git/index': No such file or directory Output a nice error message instead. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano