git/git-commit.sh, branch v0.99.9a

update usage string for git-commit.sh

2005-10-29T05:21:29Z

Signed-off-by: Chris Shoemaker Signed-off-by: Junio C Hamano

Teach git-add and git-commit to handle filenames starting with '-'.

2005-10-18T07:27:50Z

Recent '--' fixes to "git diff" by Linus made it possible to specify filenames that start with '-'. But in order to do that, you need to be able to add and commit such file to begin with. Teach git-add and git-commit to honor the same '--' convention. Signed-off-by: Junio C Hamano

Write .editmsg in GIT_DIR to avoid being in git-status.

2005-10-10T00:30:19Z

It appears in the git-status output during a git-commit if you have something in info/exclude. Also for .cmitmsg and .cmitchk to make git-commit work in read-only working trees. [jc: while we are at it, I removed the use of .cmitchk temporary file which was not necessary, and renamed them -- they are out of way now and do not have to be dotfiles anymore.] Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano

[PATCH] Quote the missing GIT_DIR.

2005-10-05T18:23:23Z

Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano

Leave an empty line between log and sign-off.

2005-10-04T06:49:46Z

Signed-off-by: Junio C Hamano

Add git-symbolic-ref

2005-10-02T06:19:33Z

This adds the counterpart of git-update-ref that lets you read and create "symbolic refs". By default it uses a symbolic link to represent ".git/HEAD -> refs/heads/master", but it can be compiled to use the textfile symbolic ref. The places that did 'readlink .git/HEAD' and 'ln -s refs/heads/blah .git/HEAD' have been converted to use new git-symbolic-ref command, so that they can deal with either implementation. Signed-off-by: Junio C Hamano

Use git-update-ref in scripts.

2005-09-28T23:42:44Z

This uses the git-update-ref command in scripts for safer updates. Also places where we used to read HEAD ref by using "cat" were fixed to use git-rev-parse. This will matter when we start using symbolic references. Signed-off-by: Junio C Hamano

git-commit: use update-index --stdin, instead of xargs.

2005-09-27T23:59:45Z

Now update-index supports '-z --stdin', we do not have to rely on platform xargs to support -0 option. Signed-off-by: Junio C Hamano

Give default merge message after failed automerge.

2005-09-27T01:04:17Z

Signed-off-by: Junio C Hamano

Multi-backend merge driver.

2005-09-11T01:30:41Z

The new command 'git merge' takes the current head and one or more remote heads, with the commit log message for the automated case. If the heads being merged are simple fast-forwards, it acts the same way as the current 'git resolve'. Otherwise, it tries different merge strategies and takes the result from the one that succeeded auto-merging, if there is any. If no merge strategy succeeds auto-merging, their results are evaluated for number of paths needed for hand resolving, and the one with the least number of such paths is left in the working tree. The user is asked to resolve them by hand and make a commit manually. The calling convention from the 'git merge' driver to merge strategy programs is very simple: - A strategy program is to be called 'git-merge-'. - They take input of this form: ... '--' ... That is, one or more the common ancestors, double dash, the current head, and one or more remote heads being merged into the current branch. - Before a strategy program is called, the working tree is matched to the current . - The strategy program exits with status code 0 when it successfully auto-merges the given heads. It should do update-cache for all the merged paths when it does so -- the index file will be used to record the merge result as a commit by the driver. - The strategy program exits with status code 1 when it leaves conflicts behind. It should do update-cache for all the merged paths that it successfully auto-merged, and leave the cache entry in the index file as the same as for paths it could not auto-merge, and leave its best-effort result with conflict markers in the working tree when it does so. - The strategy program exists with status code other than 0 or 1 if it does not handle the given merge at all. As examples, this commit comes with merge strategies based on 'git resolve' and 'git octopus'. Signed-off-by: Junio C Hamano