summaryrefslogtreecommitdiff
path: root/git-am.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh/am-keep-cr'Junio C Hamano2010-03-101-7/+25
|\
| * git-am: Add am.keepcr and --no-keep-cr to override itStefan-W. Hahn2010-02-281-5/+15
| * git-am: Add command line parameter `--keep-cr` passing it to git-mailsplitStefan-W. Hahn2010-02-281-7/+15
* | Merge branch 'jn/maint-fix-pager'Junio C Hamano2010-03-021-4/+1
|\ \ | |/ |/|
| * am: Fix launching of pagerJonathan Nieder2010-02-141-4/+1
* | am: remove rebase-apply directory before gcJonathan Nieder2010-02-231-2/+1
|/
* am: switch --resolved to --continueJeff King2010-02-111-2/+3
* am: fix patch format detection for Thunderbird "Save As" emailsStephen Boyd2010-01-251-1/+2
* Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-1/+5
* Merge branch 'jc/maint-am-keep'Junio C Hamano2009-11-301-5/+6
|\
| * Remove dead code from "git am"Junio C Hamano2009-11-271-5/+6
* | Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-251-2/+2
|\ \
| * | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-231-2/+2
* | | Merge branch 'ls/maint-mailinfo-no-inbody'Junio C Hamano2009-11-221-3/+10
|\ \ \
| * | | git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström2009-11-201-3/+10
| |/ /
* | | am -i, git-svn: use "git var GIT_PAGER"Jonathan Nieder2009-11-131-1/+4
|/ /
* | git-am: force egrep to use correct characters setChristian Himpel2009-09-251-1/+1
* | git-am: fixed patch_format detection according to RFC2822Christian Himpel2009-09-251-1/+1
* | am/mailinfo: Disable scissors processing by defaultJunio C Hamano2009-08-261-6/+17
* | Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano2009-08-211-1/+3
|\ \
| * | git apply: option to ignore whitespace differencesGiuseppe Bilotta2009-08-051-1/+3
* | | Merge branch 'bc/mailsplit-cr-at-eol'Junio C Hamano2009-08-211-1/+7
|\ \ \
| * | | Allow mailsplit (and hence git-am) to handle mails with CRLF line-endingsJunio C Hamano2009-08-051-1/+7
| |/ /
* | | git-am: print fair error message when format detection failsNicolas Sebrecht2009-08-061-1/+5
* | | am: allow individual e-mail files as inputJunio C Hamano2009-08-061-0/+14
|/ /
* | Merge branch 'gb/am-foreign'Junio C Hamano2009-07-061-4/+127
|\ \
| * | git-am: refactor 'cleaning up and aborting'Giuseppe Bilotta2009-06-131-14/+13
| * | git-am foreign patch support: StGIT supportGiuseppe Bilotta2009-05-281-0/+57
| * | git-am foreign patch support: autodetect some patch formatsGiuseppe Bilotta2009-05-281-1/+39
| * | git-am foreign patch support: introduce patch_formatGiuseppe Bilotta2009-05-281-4/+33
* | | am, rebase: teach quiet optionStephen Boyd2009-06-181-7/+19
* | | am: suppress apply errors when using 3-wayStephen Boyd2009-06-181-1/+8
|/ /
* | am: simplify "sq" function by using "git rev-parse --sq-quote"Christian Couder2009-05-101-5/+1
* | Work around ash "alternate value" expansion bugBen Jackson2009-04-181-1/+1
* | git-am: teach git-am to apply a patch to an unborn branchNanako Shiraishi2009-04-121-5/+24
* | git-am: make --abort less dangerousJunio C Hamano2009-02-261-0/+7
* | git-am: Keep index in case of abort with dirty indexMichael J Gruber2009-02-261-3/+10
* | Merge branch 'ns/am-slacker'Junio C Hamano2009-02-041-1/+20
|\ \
| * | git-am: Add --ignore-date optionNanako Shiraishi2009-01-251-0/+8
| * | am: Add --committer-date-is-author-date optionJunio C Hamano2009-01-251-1/+12
* | | git-am: minor cleanupsJay Soffian2009-01-281-8/+4
|/ /
* | git-am: implement --reject option passed to git-applymartin f. krafft2009-01-231-0/+3
* | Merge branch 'jf/am-failure-report'Junio C Hamano2009-01-211-1/+1
|\ \
| * | git-am: re-fix the diag message printingJunio C Hamano2009-01-181-1/+1
| * | git-am: Make it easier to see which patch failedJonas Flodén2009-01-171-1/+1
* | | git-am: fix shell quotingJunio C Hamano2009-01-141-1/+1
* | | git-am: add --directory=<dir> optionJunio C Hamano2009-01-121-4/+13
|/ /
* | git-am: rename apply_opt_extra file to apply-optJunio C Hamano2008-12-051-2/+2
* | git-am: propagate --3way options as wellJunio C Hamano2008-12-041-2/+7
* | git-am: propagate -C<n>, -p<n> options as wellJunio C Hamano2008-12-041-7/+7
View Lorry Controller Status