summaryrefslogtreecommitdiffstats
path: root/git-am.sh
AgeCommit message (Expand)AuthorLines
2010-06-27Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano-4/+10
2010-06-18Merge branch 'rr/am-help'Junio C Hamano-10/+19
2010-06-16am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian-4/+10
2010-06-02git am: Remove stray error message from sedRamkumar Ramachandra-1/+7
2010-06-02git am: Display some help text when patch is emptyRamkumar Ramachandra-0/+2
2010-06-02git am: Set cmdline globallyRamkumar Ramachandra-9/+10
2010-05-31git-am: suggest what to do with superfluous patchesJan Krüger-0/+2
2010-05-21Merge branch 'jc/am-3-show-corrupted-patch'Junio C Hamano-1/+1
2010-04-14am -3: recover the diagnostic messages for corrupt patchesJunio C Hamano-1/+1
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano-0/+13
2010-03-12rebase: support automatic notes copyingThomas Rast-1/+4
2010-03-12rebase: invoke post-rewrite hookThomas Rast-0/+10
2010-03-10Merge branch 'sh/am-keep-cr'Junio C Hamano-7/+25
2010-03-02Merge branch 'jn/maint-fix-pager'Junio C Hamano-4/+1
2010-02-28git-am: Add am.keepcr and --no-keep-cr to override itStefan-W. Hahn-5/+15
2010-02-28git-am: Add command line parameter `--keep-cr` passing it to git-mailsplitStefan-W. Hahn-7/+15
2010-02-23am: remove rebase-apply directory before gcJonathan Nieder-2/+1
2010-02-14am: Fix launching of pagerJonathan Nieder-4/+1
2010-02-11am: switch --resolved to --continueJeff King-2/+3
2010-01-25am: fix patch format detection for Thunderbird "Save As" emailsStephen Boyd-1/+2
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano-1/+5
2009-11-30Merge branch 'jc/maint-am-keep'Junio C Hamano-5/+6
2009-11-27Remove dead code from "git am"Junio C Hamano-5/+6
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano-2/+2
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano-2/+2
2009-11-22Merge branch 'ls/maint-mailinfo-no-inbody'Junio C Hamano-3/+10
2009-11-20git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström-3/+10
2009-11-13am -i, git-svn: use "git var GIT_PAGER"Jonathan Nieder-1/+4
2009-09-25git-am: force egrep to use correct characters setChristian Himpel-1/+1
2009-09-25git-am: fixed patch_format detection according to RFC2822Christian Himpel-1/+1
2009-08-26am/mailinfo: Disable scissors processing by defaultJunio C Hamano-6/+17
2009-08-21Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano-1/+3
2009-08-21Merge branch 'bc/mailsplit-cr-at-eol'Junio C Hamano-1/+7
2009-08-06git-am: print fair error message when format detection failsNicolas Sebrecht-1/+5
2009-08-06am: allow individual e-mail files as inputJunio C Hamano-0/+14
2009-08-05Allow mailsplit (and hence git-am) to handle mails with CRLF line-endingsJunio C Hamano-1/+7
2009-08-05git apply: option to ignore whitespace differencesGiuseppe Bilotta-1/+3
2009-07-06Merge branch 'gb/am-foreign'Junio C Hamano-4/+127
2009-06-18am, rebase: teach quiet optionStephen Boyd-7/+19
2009-06-18am: suppress apply errors when using 3-wayStephen Boyd-1/+8
2009-06-13git-am: refactor 'cleaning up and aborting'Giuseppe Bilotta-14/+13
2009-05-28git-am foreign patch support: StGIT supportGiuseppe Bilotta-0/+57
2009-05-28git-am foreign patch support: autodetect some patch formatsGiuseppe Bilotta-1/+39
2009-05-28git-am foreign patch support: introduce patch_formatGiuseppe Bilotta-4/+33
2009-05-10am: simplify "sq" function by using "git rev-parse --sq-quote"Christian Couder-5/+1
2009-04-18Work around ash "alternate value" expansion bugBen Jackson-1/+1
2009-04-12git-am: teach git-am to apply a patch to an unborn branchNanako Shiraishi-5/+24
2009-02-26git-am: make --abort less dangerousJunio C Hamano-0/+7
2009-02-26git-am: Keep index in case of abort with dirty indexMichael J Gruber-3/+10
2009-02-04Merge branch 'ns/am-slacker'Junio C Hamano-1/+20