summaryrefslogtreecommitdiff
path: root/git-am.sh
AgeCommit message (Expand)AuthorFilesLines
2011-05-21i18n: git-am add git-sh-i18nLibravatar Ævar Arnfjörð Bjarmason1-0/+1
2010-12-28Merge branch 'jc/maint-rebase-rewrite-last-skip'Libravatar Junio C Hamano1-7/+0
2010-12-22rebase --skip: correctly wrap-up when skipping the last patchLibravatar Junio C Hamano1-7/+0
2010-12-22Merge branch 'jc/maint-am-abort-safely'Libravatar Junio C Hamano1-2/+25
2010-12-21am --abort: keep unrelated commits since the last failure and warnLibravatar Junio C Hamano1-2/+25
2010-10-21Sync with 1.7.3.2Libravatar Junio C Hamano1-1/+1
2010-10-21Merge branch 'sn/doc-opt-notation' into maintLibravatar Junio C Hamano1-1/+1
2010-10-13Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-10-13shell portability: no "export VAR=VAL"Libravatar Junio C Hamano1-1/+1
2010-10-08Use parentheses and `...' where appropriateLibravatar Štěpán Němec1-1/+1
2010-10-03git-am: fix detection of absolute paths for windowsLibravatar Pat Thoyts1-6/+6
2010-06-27Merge branch 'js/maint-am-rebase-invalid-author'Libravatar Junio C Hamano1-4/+10
2010-06-18Merge branch 'rr/am-help'Libravatar Junio C Hamano1-10/+19
2010-06-16am: use get_author_ident_from_commit instead of mailinfo when rebasingLibravatar Jay Soffian1-4/+10
2010-06-02git am: Remove stray error message from sedLibravatar Ramkumar Ramachandra1-1/+7
2010-06-02git am: Display some help text when patch is emptyLibravatar Ramkumar Ramachandra1-0/+2
2010-06-02git am: Set cmdline globallyLibravatar Ramkumar Ramachandra1-9/+10
2010-05-31git-am: suggest what to do with superfluous patchesLibravatar Jan Krüger1-0/+2
2010-05-21Merge branch 'jc/am-3-show-corrupted-patch'Libravatar Junio C Hamano1-1/+1
2010-04-14am -3: recover the diagnostic messages for corrupt patchesLibravatar Junio C Hamano1-1/+1
2010-03-24Merge branch 'tr/notes-display'Libravatar Junio C Hamano1-0/+13
2010-03-12rebase: support automatic notes copyingLibravatar Thomas Rast1-1/+4
2010-03-12rebase: invoke post-rewrite hookLibravatar Thomas Rast1-0/+10
2010-03-10Merge branch 'sh/am-keep-cr'Libravatar Junio C Hamano1-7/+25
2010-03-02Merge branch 'jn/maint-fix-pager'Libravatar Junio C Hamano1-4/+1
2010-02-28git-am: Add am.keepcr and --no-keep-cr to override itLibravatar Stefan-W. Hahn1-5/+15
2010-02-28git-am: Add command line parameter `--keep-cr` passing it to git-mailsplitLibravatar Stefan-W. Hahn1-7/+15
2010-02-23am: remove rebase-apply directory before gcLibravatar Jonathan Nieder1-2/+1
2010-02-14am: Fix launching of pagerLibravatar Jonathan Nieder1-4/+1
2010-02-11am: switch --resolved to --continueLibravatar Jeff King1-2/+3
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