user/sven/git.git/git-am.sh, branch v1.7.3.5

Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint

2010-12-28T21:43:10Z

* jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch

rebase --skip: correctly wrap-up when skipping the last patch

2010-12-23T00:50:28Z

When "rebase --skip" is used to skip the last patch in the series, the code to wrap up the rewrite by copying the notes from old to new commits and also by running the post-rewrite hook was bypassed. Signed-off-by: Junio C Hamano

am --abort: keep unrelated commits since the last failure and warn

2010-12-21T19:16:28Z

After making commits (either by pulling or doing their own work) after a failed "am", the user will be reminded by next "am" invocation that there was a failed "am" that the user needs to decide to resolve or to get rid of the old "am" attempt. The "am --abort" option was meant to help the latter. However, it rewinded the HEAD back to the beginning of the failed "am" attempt, discarding commits made (perhaps by mistake) since. Signed-off-by: Junio C Hamano

Merge branch 'sn/doc-opt-notation' into maint

2010-10-21T23:26:42Z

* sn/doc-opt-notation: Fix {update,checkout}-index usage strings Put a space between `<' and argument in pack-objects usage string Remove stray quotes in --pretty and --format documentation Use parentheses and `...' where appropriate Fix odd markup in --diff-filter documentation Use angles for placeholders consistently

shell portability: no "export VAR=VAL"

2010-10-13T18:36:36Z

It is more portable to say "VAR=VAL && export VAR" instead. Noticed by Ævar. Signed-off-by: Junio C Hamano

Use parentheses and `...' where appropriate

2010-10-08T19:31:07Z

Remove some stray usage of other bracket types and asterisks for the same purpose. Signed-off-by: Štěpán Němec Acked-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'js/maint-am-rebase-invalid-author'

2010-06-27T19:07:44Z

* js/maint-am-rebase-invalid-author: am: use get_author_ident_from_commit instead of mailinfo when rebasing

Merge branch 'rr/am-help'

2010-06-18T18:16:56Z

* rr/am-help: git am: Remove stray error message from sed git am: Display some help text when patch is empty git am: Set cmdline globally

am: use get_author_ident_from_commit instead of mailinfo when rebasing

2010-06-16T17:00:58Z

In certain situations, commit authorship can consist of an invalid e-mail address. For example, this is the case when working with git svn repos where the author email has had the svn repo UUID appended such as: author@example.com Given such an address, mailinfo extracts the authorship incorrectly as it assumes a valid domain. However, when rebasing the original authorship should be preserved irrespective of its validity as an email address. Using get_author_ident_from_commit instead of mailinfo when rebasing preserves the original authorship. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano

git am: Remove stray error message from sed

2010-06-02T16:53:45Z

When --continue is invoked without any changes, the following stray error message appears- sed: can't read $dotest/final-commit: No such file or directory. Remove this by making sure that the file actually exists. Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano