aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
Commit message (Expand)AuthorAge
* Merge branch 'jc/maint-am-abort-safely'Junio C Hamano2010-12-22
|\
| * am --abort: keep unrelated commits since the last failure and warnJunio C Hamano2010-12-21
* | Sync with 1.7.3.2Junio C Hamano2010-10-21
|\ \ | |/
| * Merge branch 'sn/doc-opt-notation' into maintJunio C Hamano2010-10-21
| |\
| | * Use parentheses and `...' where appropriateŠtěpán Němec2010-10-08
* | | Merge branch 'maint'Junio C Hamano2010-10-13
|\ \ \ | |/ /
| * | shell portability: no "export VAR=VAL"Junio C Hamano2010-10-13
| |/
* | git-am: fix detection of absolute paths for windowsPat Thoyts2010-10-03
|/
* Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2010-06-27
|\
| * am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-16
* | Merge branch 'rr/am-help'Junio C Hamano2010-06-18
|\ \
| * | git am: Remove stray error message from sedRamkumar Ramachandra2010-06-02
| * | git am: Display some help text when patch is emptyRamkumar Ramachandra2010-06-02
| * | git am: Set cmdline globallyRamkumar Ramachandra2010-06-02
* | | git-am: suggest what to do with superfluous patchesJan Krüger2010-05-31
|/ /
* | Merge branch 'jc/am-3-show-corrupted-patch'Junio C Hamano2010-05-21
|\ \ | |/ |/|
| * am -3: recover the diagnostic messages for corrupt patchesJunio C Hamano2010-04-14
* | Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
|\ \
| * | rebase: support automatic notes copyingThomas Rast2010-03-12
| * | rebase: invoke post-rewrite hookThomas Rast2010-03-12
* | | Merge branch 'sh/am-keep-cr'Junio C Hamano2010-03-10
|\ \ \
| * | | git-am: Add am.keepcr and --no-keep-cr to override itStefan-W. Hahn2010-02-28
| * | | git-am: Add command line parameter `--keep-cr` passing it to git-mailsplitStefan-W. Hahn2010-02-28
* | | | Merge branch 'jn/maint-fix-pager'Junio C Hamano2010-03-02
|\ \ \ \ | |/ / / |/| | |
| * | | am: Fix launching of pagerJonathan Nieder2010-02-14
* | | | am: remove rebase-apply directory before gcJonathan Nieder2010-02-23
|/ / /
* | | am: switch --resolved to --continueJeff King2010-02-11
* | | am: fix patch format detection for Thunderbird "Save As" emailsStephen Boyd2010-01-25
|/ /
* | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-04
* | Merge branch 'jc/maint-am-keep'Junio C Hamano2009-11-30
|\ \
| * | Remove dead code from "git am"Junio C Hamano2009-11-27
* | | Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-25
|\ \ \
| * | | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-23
* | | | Merge branch 'ls/maint-mailinfo-no-inbody'Junio C Hamano2009-11-22
|\ \ \ \
| * | | | git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström2009-11-20
| |/ / /
* | | | am -i, git-svn: use "git var GIT_PAGER"Jonathan Nieder2009-11-13
|/ / /
* | | git-am: force egrep to use correct characters setChristian Himpel2009-09-25
* | | git-am: fixed patch_format detection according to RFC2822Christian Himpel2009-09-25
* | | am/mailinfo: Disable scissors processing by defaultJunio C Hamano2009-08-26
* | | Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano2009-08-21
|\ \ \
| * | | git apply: option to ignore whitespace differencesGiuseppe Bilotta2009-08-05
* | | | Merge branch 'bc/mailsplit-cr-at-eol'Junio C Hamano2009-08-21
|\ \ \ \
| * | | | Allow mailsplit (and hence git-am) to handle mails with CRLF line-endingsJunio C Hamano2009-08-05
| |/ / /
* | | | git-am: print fair error message when format detection failsNicolas Sebrecht2009-08-06
* | | | am: allow individual e-mail files as inputJunio C Hamano2009-08-06
|/ / /
* | | Merge branch 'gb/am-foreign'Junio C Hamano2009-07-06
|\ \ \
| * | | git-am: refactor 'cleaning up and aborting'Giuseppe Bilotta2009-06-13
| * | | git-am foreign patch support: StGIT supportGiuseppe Bilotta2009-05-28
| * | | git-am foreign patch support: autodetect some patch formatsGiuseppe Bilotta2009-05-28
| * | | git-am foreign patch support: introduce patch_formatGiuseppe Bilotta2009-05-28