git/git-am.sh, branch v1.6.3

Work around ash "alternate value" expansion bug

2009-04-19T04:37:46Z

Ash (used as /bin/sh on many distros) has a shell expansion bug for the form ${var:+word word}. The result is a single argument "word word". Work around by using ${var:+word} ${var:+word} or equivalent. Signed-off-by: Ben Jackson Signed-off-by: Junio C Hamano

git-am: teach git-am to apply a patch to an unborn branch

2009-04-13T01:42:15Z

People sometimes wonder why they cannot apply a patch that only creates new files to an unborn branch. Signed-off-by: Nanako Shiraishi Signed-off-by: Junio C Hamano

git-am: make --abort less dangerous

2009-02-27T07:06:38Z

When you are in the middle of "git rebase", "git am --abort" by mistake would have referred to nonexistent ORIG_HEAD and barfed, or worse yet, used a stale ORIG_HEAD and taken you to an unexpected commit. Also the option parsing did not reject "git am --abort --skip". Signed-off-by: Junio C Hamano

git-am: Keep index in case of abort with dirty index

2009-02-27T07:06:27Z

git am --abort resets the index unconditionally. But in case a previous git am exited due to a dirty index it is preferable to keep that index. Make it so. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

Merge branch 'ns/am-slacker'

2009-02-04T21:07:02Z

* ns/am-slacker: git-am: Add --ignore-date option am: Add --committer-date-is-author-date option Conflicts: git-am.sh

git-am: minor cleanups

2009-01-28T18:53:34Z

Update usage statement to remove a no-longer supported option, and to hide two options (one a no-op, one internal) unless --help-all is used. Use "test -t 0" instead of "tty -s" to detect when stdin is a terminal. (test -t 0 is used elsewhere in git-am and in other git shell scripts, tty -s is not, and appears to be deprecated by POSIX) Use "test ..." instead of "[ ... ]" and "die " instead of "echo >&2; exit 1" to be consistent with rest of script. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano

git-am: Add --ignore-date option

2009-01-26T02:56:13Z

This new option tells 'git-am' to ignore the date header field recorded in the format-patch output. The commits will have the timestamp when they are created instead. You can work a lot in one day to accumulate many changes, but apply and push to the public repository only some of them at the end of the first day. Then next day you can spend all your working hours reading comics or chatting with your coworkers, and apply your remaining patches from the previous day using this option to pretend that you have been working at the end of the day. Signed-off-by: しらいしななこ Signed-off-by: Junio C Hamano

am: Add --committer-date-is-author-date option

2009-01-26T02:55:49Z

This new option tells 'git-am' to use the timestamp recorded in the Email message as both author and committer date. Signed-off-by: しらいしななこ Signed-off-by: Junio C Hamano

git-am: implement --reject option passed to git-apply

2009-01-24T01:00:12Z

With --reject, git-am simply passes the --reject option to git-apply and thus allows people to work with reject files if they so prefer. Signed-off-by: martin f. krafft Signed-off-by: Junio C Hamano

Merge branch 'jf/am-failure-report'

2009-01-22T00:51:18Z

* jf/am-failure-report: git-am: re-fix the diag message printing git-am: Make it easier to see which patch failed