summaryrefslogtreecommitdiff
path: root/git-am.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
* git-am --whitespace: do not lose the command line optionJunio C Hamano2008-12-041-4/+4
* git-am: ignore --binary optionStephan Beyer2008-08-161-12/+7
* Replace uses of "git-var" with "git var"Todd Zullinger2008-07-301-1/+1
* git-am: Mention --abort in usage string part of OPTIONS_SPECStephan Beyer2008-07-251-2/+1
* git-am: Add colon before the subject that is printed out as being appliedStephan Beyer2008-07-231-1/+1
* git am --skip: clean the index while preserving local changesOlivier Marin2008-07-221-3/+9
* git-am: remove dash from help messageOlivier Marin2008-07-211-1/+1
* Rename .git/rebase to .git/rebase-applyJohannes Schindelin2008-07-211-1/+1
* Merge branch 'ns/am-abort'Junio C Hamano2008-07-201-4/+17
|\
| * git am --abortNanako Shiraishi2008-07-191-4/+17
* | Merge branch 'sb/dashless'Junio C Hamano2008-07-161-3/+3
|\ \ | |/ |/|
| * Make usage strings dash-lessStephan Beyer2008-07-131-3/+3
* | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-151-3/+3
* | Merge branch 'jc/rebase-orig-head'Junio C Hamano2008-07-141-0/+1
|\ \
| * | Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano2008-07-071-0/+1
| |/
View Lorry Controller Status