| Commit message (Expand) | Author | Age | Files | Lines |
* | am: refresh the index at start and --resolved | Jeff King | 2011-08-16 | 1 | -0/+2 |
* | Merge branch 'jc/maint-rebase-rewrite-last-skip' | Junio C Hamano | 2010-12-28 | 1 | -7/+0 |
|\ |
|
| * | rebase --skip: correctly wrap-up when skipping the last patch | Junio C Hamano | 2010-12-22 | 1 | -7/+0 |
* | | Merge branch 'jc/maint-am-abort-safely' | Junio C Hamano | 2010-12-22 | 1 | -2/+25 |
|\ \ |
|
| * | | am --abort: keep unrelated commits since the last failure and warn | Junio C Hamano | 2010-12-21 | 1 | -2/+25 |
| |/ |
|
* | | Sync with 1.7.3.2 | Junio C Hamano | 2010-10-21 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Merge branch 'sn/doc-opt-notation' into maint | Junio C Hamano | 2010-10-21 | 1 | -1/+1 |
| |\ |
|
| | * | Use parentheses and `...' where appropriate | Štěpán Němec | 2010-10-08 | 1 | -1/+1 |
* | | | Merge branch 'maint' | Junio C Hamano | 2010-10-13 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | shell portability: no "export VAR=VAL" | Junio C Hamano | 2010-10-13 | 1 | -1/+1 |
| |/ |
|
* | | git-am: fix detection of absolute paths for windows | Pat Thoyts | 2010-10-03 | 1 | -6/+6 |
|/ |
|
* | Merge branch 'js/maint-am-rebase-invalid-author' | Junio C Hamano | 2010-06-27 | 1 | -4/+10 |
|\ |
|
| * | am: use get_author_ident_from_commit instead of mailinfo when rebasing | Jay Soffian | 2010-06-16 | 1 | -4/+10 |
* | | Merge branch 'rr/am-help' | Junio C Hamano | 2010-06-18 | 1 | -10/+19 |
|\ \ |
|
| * | | git am: Remove stray error message from sed | Ramkumar Ramachandra | 2010-06-02 | 1 | -1/+7 |
| * | | git am: Display some help text when patch is empty | Ramkumar Ramachandra | 2010-06-02 | 1 | -0/+2 |
| * | | git am: Set cmdline globally | Ramkumar Ramachandra | 2010-06-02 | 1 | -9/+10 |
* | | | git-am: suggest what to do with superfluous patches | Jan Krüger | 2010-05-31 | 1 | -0/+2 |
|/ / |
|
* | | Merge branch 'jc/am-3-show-corrupted-patch' | Junio C Hamano | 2010-05-21 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | am -3: recover the diagnostic messages for corrupt patches | Junio C Hamano | 2010-04-14 | 1 | -1/+1 |
* | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 1 | -0/+13 |
|\ \ |
|
| * | | rebase: support automatic notes copying | Thomas Rast | 2010-03-12 | 1 | -1/+4 |
| * | | rebase: invoke post-rewrite hook | Thomas Rast | 2010-03-12 | 1 | -0/+10 |
* | | | Merge branch 'sh/am-keep-cr' | Junio C Hamano | 2010-03-10 | 1 | -7/+25 |
|\ \ \ |
|
| * | | | git-am: Add am.keepcr and --no-keep-cr to override it | Stefan-W. Hahn | 2010-02-28 | 1 | -5/+15 |
| * | | | git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit | Stefan-W. Hahn | 2010-02-28 | 1 | -7/+15 |
* | | | | Merge branch 'jn/maint-fix-pager' | Junio C Hamano | 2010-03-02 | 1 | -4/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | am: Fix launching of pager | Jonathan Nieder | 2010-02-14 | 1 | -4/+1 |
* | | | | am: remove rebase-apply directory before gc | Jonathan Nieder | 2010-02-23 | 1 | -2/+1 |
|/ / / |
|
* | | | am: switch --resolved to --continue | Jeff King | 2010-02-11 | 1 | -2/+3 |
* | | | am: fix patch format detection for Thunderbird "Save As" emails | Stephen Boyd | 2010-01-25 | 1 | -1/+2 |
|/ / |
|
* | | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 | 1 | -1/+5 |
* | | Merge branch 'jc/maint-am-keep' | Junio C Hamano | 2009-11-30 | 1 | -5/+6 |
|\ \ |
|
| * | | Remove dead code from "git am" | Junio C Hamano | 2009-11-27 | 1 | -5/+6 |
* | | | Merge branch 'rs/work-around-grep-opt-insanity' | Junio C Hamano | 2009-11-25 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | Protect scripted Porcelains from GREP_OPTIONS insanity | Junio C Hamano | 2009-11-23 | 1 | -2/+2 |
* | | | | Merge branch 'ls/maint-mailinfo-no-inbody' | Junio C Hamano | 2009-11-22 | 1 | -3/+10 |
|\ \ \ \ |
|
| * | | | | git am/mailinfo: Don't look at in-body headers when rebasing | Lukas Sandström | 2009-11-20 | 1 | -3/+10 |
| |/ / / |
|
* | | | | am -i, git-svn: use "git var GIT_PAGER" | Jonathan Nieder | 2009-11-13 | 1 | -1/+4 |
|/ / / |
|
* | | | git-am: force egrep to use correct characters set | Christian Himpel | 2009-09-25 | 1 | -1/+1 |
* | | | git-am: fixed patch_format detection according to RFC2822 | Christian Himpel | 2009-09-25 | 1 | -1/+1 |
* | | | am/mailinfo: Disable scissors processing by default | Junio C Hamano | 2009-08-26 | 1 | -6/+17 |
* | | | Merge branch 'gb/apply-ignore-whitespace' | Junio C Hamano | 2009-08-21 | 1 | -1/+3 |
|\ \ \ |
|
| * | | | git apply: option to ignore whitespace differences | Giuseppe Bilotta | 2009-08-05 | 1 | -1/+3 |
* | | | | Merge branch 'bc/mailsplit-cr-at-eol' | Junio C Hamano | 2009-08-21 | 1 | -1/+7 |
|\ \ \ \ |
|
| * | | | | Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings | Junio C Hamano | 2009-08-05 | 1 | -1/+7 |
| |/ / / |
|
* | | | | git-am: print fair error message when format detection fails | Nicolas Sebrecht | 2009-08-06 | 1 | -1/+5 |
* | | | | am: allow individual e-mail files as input | Junio C Hamano | 2009-08-06 | 1 | -0/+14 |
|/ / / |
|
* | | | Merge branch 'gb/am-foreign' | Junio C Hamano | 2009-07-06 | 1 | -4/+127 |
|\ \ \ |
|
| * | | | git-am: refactor 'cleaning up and aborting' | Giuseppe Bilotta | 2009-06-13 | 1 | -14/+13 |