user/sven/git.git/git-applypatch.sh, branch v1.5.0.7

Fix more typos, primarily in the code

2006-07-10T07:36:44Z

The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin Signed-off-by: Junio C Hamano

Include ref log detail in commit, reset, etc.

2006-05-19T22:03:21Z

When updating a ref at the direction of the user include a reason why head was changed as part of the ref log (assuming it was enabled). Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

applymbox: typofix

2005-12-15T21:03:20Z

Sorry, I broke this command completely with the stupid typo. Noticed by Marco Costalba. Signed-off-by: Junio C Hamano

applypatch: no need to do non-portable [[ ... ]]

2005-12-14T10:53:45Z

... when old, proven, case would do. Signed-off-by: Junio C Hamano

git-applypatch: Usage string clean-up, emit usage string at incorrect invocation

2005-12-14T10:53:44Z

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

Use printf rather than echo -n.

2005-12-07T02:09:12Z

On AIX, there is no -n option to the system's echo. Instead, it needs the '\c' control character. We could replace echo -n "foo" with echo -e "foo\c" but printf is recommended by most man pages. Tested on AIX 5.3, Solaris 8, and Debian. [jc: futureproofed two instances that uses variable with '%s' so later feeding different messages would not break things too easily; others are emitting literal so whoever changes the literal ought to notice more easily so they are safe.] Signed-off-by: E. Jason Riedy Signed-off-by: Junio C Hamano

applypatch: use "index" lines not "applies-to".

2005-11-29T22:18:27Z

This matches the 3-way fallback used by applypatch to use per-blob "index" lines, not "applies-to" tree object name, to match what git-am does. 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

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

git-applypatch: cleanup.

2005-10-05T00:04:44Z

- Defined variable $INFO was not used properly. - Make sure there is an empty line between the sign-off and the log message. Signed-off-by: Junio C Hamano