git/git-pull-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.

Duh. Fix transposed characters in git-pull-script

2005-06-28T17:15:10Z

I'd stupidly only tested the non-branch-name version.

Teach git-pull-script about pulling tags

2005-06-28T03:10:32Z

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.

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.

Make fetch/pull scripts terminate cleanly on errors

2005-06-07T00:40:22Z

Don't continue with a merge if the fetch failed.

git-pull-script: pretty-print the merge head information

2005-05-25T21:05:13Z

This also drops the common ".git" part from the end of the repo name, and if a non-default head reference is given, makes a nicer commit message about it.

Split up git-pull-script into separate "fetch" and "merge" phases.

2005-05-22T18:03:24Z

This allows you to just fetch stuff first, inspect it, and then resolve the merge separately if everything looks good.

Introduce GIT_DIR environment variable.

2005-05-10T05:57:58Z

During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano