git/git-resolve-script, branch v0.99

Make "git resolve" take the merge message in $3

2005-07-09T00:38:44Z

It used to do "Merge $3" as the message, but that ends up being inconvenient, and much more easily done inside git-pull-script instead. This makes the third argument to "git resolve" much easier to explain.

Add "git-sh-setup-script" for common git shell script setup

2005-07-08T17:57:21Z

It sets up the normal git environment variables and a few helper functions (currently just "die()"), and returns ok if it all looks like a git archive. So use it something like . git-sh-setup-script || die "Not a git archive" to make the rest of the git scripts more careful and readable.

Clean up different special *HEAD handling

2005-06-21T21:04:13Z

We codify the following different heads (in addition to the main "HEAD", which points to the current branch, of course): - FETCH_HEAD Populated by "git fetch" - ORIG_HEAD The old HEAD before a "git pull/resolve" (successful or not) - LAST_MERGE The HEAD we're currently merging in "git pull/resolve" - MERGE_HEAD The previous head of a unresolved "git pull", which gets committed by a "git commit" after manually resolving the result We used to have "MERGE_HEAD" be populated directly by the fetch, and we removed ORIG_HEAD and LAST_MERGE too aggressively.

[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse

2005-06-20T22:49:39Z

Make git-resolve-script only write MERGE_HEAD if a merge actually occurred. All merge failures leave ORIG_HEAD and LAST_MERGE behind (instead of ORIG_HEAD and MERGE_HEAD). Use git-rev-parse to expand arguments (and check for bad ones). Signed-off-by: Dan Holmsand Signed-off-by: Linus Torvalds

Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.

2005-06-20T02:42:21Z

Otherwise you'll be bitten by a stale MERGE_HEAD like Jeff was..

Trivial git script fixups

2005-06-15T01:56:05Z

Fix permissions, and add trivial "reset" and "add" scripts. The "reset" script just resets the index back to head, while the "add" script is just a crutch for people used to do "cvs add".

Make "git commit" work correctly in the presense of a manual merge

2005-06-08T20:33:15Z

This has gotten only very light testing, but something like this is clearly necessary and did the right thing for the one case I threw at it.

Make default merge messages denser.

2005-06-08T17:09:41Z

In particular, make them readable on one line since that's what all the tools like git-shortlog and gitk end up showing.

git-resolve-script: stop when the automated merge fails

2005-06-07T02:37:25Z

No point in doing a tree write that will just throw confusing messages on the screen.

git-resolve-script: don't wait for three seconds any more

2005-06-07T00:39:14Z

We used to overwrite peoples dirty state. We don't any more. So don't print the scary message and don't delay, just do the update already.