git/git-applymbox.sh, branch v1.2.2

Trivial usage string clean-up

2005-12-14T10:53:43Z

Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

applymbox: typofix to enable -m option.

2005-11-29T22:14:42Z

The -m option to fall back on 3-way merge was not honoured at all because of a typo. Signed-off-by: Junio C Hamano

git-sh-setup: die if outside git repository.

2005-11-25T21:49:17Z

Now all the users of this script detect its exit status and die, complaining that it is outside git repository. So move the code that dies from all callers to git-sh-setup script. Signed-off-by: Junio C Hamano

Brief documentation for the mysterious git-am script

2005-10-21T05:32:07Z

The git-am script is nowhere called and nowhere (including itself) explained, and the name isn't helpful either. For those like me who will wonder what is it about, add some documentation stub for it to the documentation. I probably got something wrong and I don't feel like investigating all the options - this is just kind of "emergency" docs. Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

mailsplit: -d

2005-10-06T21:25:52Z

Instead of the default 4 digits with leading zeros, different precision can be specified for the generated filenames. Signed-off-by: Junio C Hamano

Clean mail files after dealing with them.

2005-10-06T21:25:52Z

When you are applying 200 mails in sequence, .dotest/ directory will be littered with many messsages, and when the patch in one of them fails to apply, it is not obvious which message was being processed. Remove the one that has been already dealt with, so that the last failed one is found typically as the lowest numbered split message. Signed-off-by: Junio C Hamano

Fall back to three-way merge when applying a patch.

2005-10-06T21:25:52Z

After git-apply fails, attempt to find a base tree that the patch cleanly applies to, and do a three-way merge using that base tree into the current index, if .dotest/.3way file exists. This flag can be controlled by giving -m flag to git-applymbox command. When the fall-back merge fails, the working tree can be resolved the same way as you would normally hand resolve a conflicting merge. When making commit, use .dotest/final-commit as the log message template. Or you could just choose to 'git-checkout-index -f -a' to revert the failed merge. Signed-off-by: Junio C Hamano

Big tool rename.

2005-09-08T00:45:20Z

As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano