summaryrefslogtreecommitdiff
path: root/git-am.sh
Commit message (Expand)AuthorAgeFilesLines
* Sync with 1.7.3.2Junio C Hamano2010-10-211-1/+1
|\
| * Merge branch 'sn/doc-opt-notation' into maintJunio C Hamano2010-10-211-1/+1
| |\
| | * Use parentheses and `...' where appropriateŠtěpán Němec2010-10-081-1/+1
* | | Merge branch 'maint'Junio C Hamano2010-10-131-1/+1
|\ \ \ | |/ /
| * | shell portability: no "export VAR=VAL"Junio C Hamano2010-10-131-1/+1
| |/
* | git-am: fix detection of absolute paths for windowsPat Thoyts2010-10-031-6/+6
|/
* Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2010-06-271-4/+10
|\
| * am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-161-4/+10
* | Merge branch 'rr/am-help'Junio C Hamano2010-06-181-10/+19
|\ \
| * | git am: Remove stray error message from sedRamkumar Ramachandra2010-06-021-1/+7
| * | git am: Display some help text when patch is emptyRamkumar Ramachandra2010-06-021-0/+2
| * | git am: Set cmdline globallyRamkumar Ramachandra2010-06-021-9/+10
* | | git-am: suggest what to do with superfluous patchesJan Krüger2010-05-311-0/+2
|/ /
* | Merge branch 'jc/am-3-show-corrupted-patch'Junio C Hamano2010-05-211-1/+1
|\ \ | |/ |/|
| * am -3: recover the diagnostic messages for corrupt patchesJunio C Hamano2010-04-141-1/+1
* | Merge branch 'tr/notes-display'Junio C Hamano2010-03-241-0/+13
|\ \
| * | rebase: support automatic notes copyingThomas Rast2010-03-121-1/+4
| * | rebase: invoke post-rewrite hookThomas Rast2010-03-121-0/+10
* | | 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
|/ /
View Lorry Controller Status