summaryrefslogtreecommitdiff
path: root/git-am.sh
AgeCommit message (Expand)AuthorFilesLines
2010-01-25am: fix patch format detection for Thunderbird "Save As" emailsLibravatar Stephen Boyd1-1/+2
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsLibravatar Junio C Hamano1-1/+5
2009-11-30Merge branch 'jc/maint-am-keep'Libravatar Junio C Hamano1-5/+6
2009-11-27Remove dead code from "git am"Libravatar Junio C Hamano1-5/+6
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Libravatar Junio C Hamano1-2/+2
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityLibravatar Junio C Hamano1-2/+2
2009-11-22Merge branch 'ls/maint-mailinfo-no-inbody'Libravatar Junio C Hamano1-3/+10
2009-11-20git am/mailinfo: Don't look at in-body headers when rebasingLibravatar Lukas Sandström1-3/+10
2009-11-13am -i, git-svn: use "git var GIT_PAGER"Libravatar Jonathan Nieder1-1/+4
2009-09-25git-am: force egrep to use correct characters setLibravatar Christian Himpel1-1/+1
2009-09-25git-am: fixed patch_format detection according to RFC2822Libravatar Christian Himpel1-1/+1
2009-08-26am/mailinfo: Disable scissors processing by defaultLibravatar Junio C Hamano1-6/+17
2009-08-21Merge branch 'gb/apply-ignore-whitespace'Libravatar Junio C Hamano1-1/+3
2009-08-21Merge branch 'bc/mailsplit-cr-at-eol'Libravatar Junio C Hamano1-1/+7
2009-08-06git-am: print fair error message when format detection failsLibravatar Nicolas Sebrecht1-1/+5
2009-08-06am: allow individual e-mail files as inputLibravatar Junio C Hamano1-0/+14
2009-08-05Allow mailsplit (and hence git-am) to handle mails with CRLF line-endingsLibravatar Junio C Hamano1-1/+7
2009-08-05git apply: option to ignore whitespace differencesLibravatar Giuseppe Bilotta1-1/+3
2009-07-06Merge branch 'gb/am-foreign'Libravatar Junio C Hamano1-4/+127
2009-06-18am, rebase: teach quiet optionLibravatar Stephen Boyd1-7/+19
2009-06-18am: suppress apply errors when using 3-wayLibravatar Stephen Boyd1-1/+8
2009-06-13git-am: refactor 'cleaning up and aborting'Libravatar Giuseppe Bilotta1-14/+13
2009-05-28git-am foreign patch support: StGIT supportLibravatar Giuseppe Bilotta1-0/+57
2009-05-28git-am foreign patch support: autodetect some patch formatsLibravatar Giuseppe Bilotta1-1/+39
2009-05-28git-am foreign patch support: introduce patch_formatLibravatar Giuseppe Bilotta1-4/+33
2009-05-10am: simplify "sq" function by using "git rev-parse --sq-quote"Libravatar Christian Couder1-5/+1
2009-04-18Work around ash "alternate value" expansion bugLibravatar Ben Jackson1-1/+1
2009-04-12git-am: teach git-am to apply a patch to an unborn branchLibravatar Nanako Shiraishi1-5/+24
2009-02-26git-am: make --abort less dangerousLibravatar Junio C Hamano1-0/+7
2009-02-26git-am: Keep index in case of abort with dirty indexLibravatar Michael J Gruber1-3/+10
2009-02-04Merge branch 'ns/am-slacker'Libravatar Junio C Hamano1-1/+20
2009-01-28git-am: minor cleanupsLibravatar Jay Soffian1-8/+4
2009-01-25git-am: Add --ignore-date optionLibravatar Nanako Shiraishi1-0/+8
2009-01-25am: Add --committer-date-is-author-date optionLibravatar Junio C Hamano1-1/+12
2009-01-23git-am: implement --reject option passed to git-applyLibravatar martin f. krafft1-0/+3
2009-01-21Merge branch 'jf/am-failure-report'Libravatar Junio C Hamano1-1/+1
2009-01-18git-am: re-fix the diag message printingLibravatar Junio C Hamano1-1/+1
2009-01-17git-am: Make it easier to see which patch failedLibravatar Jonas Flodén1-1/+1
2009-01-14git-am: fix shell quotingLibravatar Junio C Hamano1-1/+1
2009-01-12git-am: add --directory=<dir> optionLibravatar Junio C Hamano1-4/+13
2008-12-05git-am: rename apply_opt_extra file to apply-optLibravatar Junio C Hamano1-2/+2
2008-12-04git-am: propagate --3way options as wellLibravatar Junio C Hamano1-2/+7
2008-12-04git-am: propagate -C<n>, -p<n> options as wellLibravatar Junio C Hamano1-7/+7
2008-12-04git-am --whitespace: do not lose the command line optionLibravatar Junio C Hamano1-4/+4
2008-08-16git-am: ignore --binary optionLibravatar Stephan Beyer1-12/+7
2008-07-30Replace uses of "git-var" with "git var"Libravatar Todd Zullinger1-1/+1
2008-07-25git-am: Mention --abort in usage string part of OPTIONS_SPECLibravatar Stephan Beyer1-2/+1
2008-07-23git-am: Add colon before the subject that is printed out as being appliedLibravatar Stephan Beyer1-1/+1
2008-07-22git am --skip: clean the index while preserving local changesLibravatar Olivier Marin1-3/+9
2008-07-21git-am: remove dash from help messageLibravatar Olivier Marin1-1/+1