aboutsummaryrefslogtreecommitdiffstats
path: root/git-am.sh
AgeCommit message (Expand)AuthorFilesLines
2014-05-18git-am: cleanup option for new flagMichael S. Tsirkin1-3/+1
2014-05-18git-am: fix up new -sMichael S. Tsirkin1-2/+5
2014-05-18git-am: fix signoffMichael S. Tsirkin1-1/+5
2014-05-18git-am use branch style names for signoffMichael S. Tsirkin1-1/+1
2014-05-18gita-am: replace --ack --signoff flagMichael S. Tsirkin1-26/+17
2014-05-18git-am: new option to allow empty commitsMichael S. Tsirkin1-3/+8
2014-05-18git-am: support any number of signaturesMichael S. Tsirkin1-3/+20
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano1-1/+1
2014-03-31comments: fix misuses of "nor"Justin Lebar1-1/+1
2014-03-25git-am.sh: use the $(...) construct for command substitutionElia Pinto1-15/+15
2014-02-03am: add the --gpg-sign optionNicolas Vigier1-1/+8
2014-02-03am: parse options in stuck-long modeNicolas Vigier1-9/+9
2014-02-03git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier1-0/+1
2013-12-05Merge branch 'jk/replace-perl-in-built-scripts'Junio C Hamano1-2/+2
2013-10-29use @@PERL@@ in built scriptsJeff King1-2/+2
2013-06-27am: replace uses of --resolved with --continueKevin Bracey1-4/+4
2013-06-17am: handle stray $dotest directoryRamkumar Ramachandra1-0/+17
2013-05-12am: return control to caller, for housekeepingRamkumar Ramachandra1-2/+7
2013-05-12am: tighten a conditional that checks for $dotestRamkumar Ramachandra1-1/+3
2013-03-21git-am: show the final log message on "Applying:" indicatorSimon Ruderich1-7/+7
2013-02-05Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano1-1/+1
2013-01-31git-am: record full index line in the patch used while rebasingJunio C Hamano1-1/+1
2013-01-28Merge branch 'dl/am-hg-locale'Junio C Hamano1-1/+1
2013-01-18am: invoke perl's strftime in C localeDmitry V. Levin1-1/+1
2012-09-07Merge branch 'nd/am-i18n-fix'Junio C Hamano1-2/+2
2012-08-22am: quote string for translation before passing to eval_gettextlnNguyễn Thái Ngọc Duy1-2/+2
2012-07-31Merge branch 'jx/i18n-1.7.11'Junio C Hamano1-12/+8
2012-07-26Remove dead code which contains bad gettext blockJiang Xin1-3/+0
2012-07-26i18n: am: mark more strings for translationJiang Xin1-6/+5
2012-07-25i18n: rebase: mark messages for translationJiang Xin1-3/+3
2012-07-22Merge branch 'pg/maint-1.7.9-am-where-is-patch'Junio C Hamano1-0/+5
2012-07-13am: indicate where a failed patch is to be foundPaul Gortmaker1-0/+5
2012-06-26am: don't call mailinfo if $rebasingMartin von Zweigbergk1-23/+24
2012-06-26am --rebasing: get patch body from commit, not from mailboxMartin von Zweigbergk1-0/+1
2012-04-20Merge branch 'jc/am-report-3way'Junio C Hamano1-0/+6
2012-04-20Merge branch 'jb/am-include'Junio C Hamano1-1/+2
2012-03-28am: support --include optionJohannes Berg1-1/+2
2012-03-28am -3: list the paths that needed 3-way fallbackJunio C Hamano1-0/+6
2012-03-13am: officially deprecate -b/--binary optionJunio C Hamano1-2/+2
2012-03-12Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano1-4/+7
2012-03-12git-am: error out when seeing -b/--binaryThomas Rast1-1/+3
2012-03-04Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano1-4/+7
2012-02-26Merge branch 'maint'Junio C Hamano1-1/+1
2012-02-26am: don't infloop for an empty input fileJim Meyering1-1/+1
2012-02-22am -3: allow nonstandard -p<num> optionJunio C Hamano1-4/+7
2012-01-29Merge branch 'tr/maint-mailinfo'Junio C Hamano1-4/+16
2012-01-16am: learn passing -b to mailinfoThomas Rast1-4/+16
2011-12-09Merge branch 'maint-1.7.7' into maintJunio C Hamano1-7/+0
2011-12-09am: don't persist keepcr flagMartin von Zweigbergk1-7/+0
2011-10-05Merge branch 'gb/am-hg-patch'Junio C Hamano1-0/+34
2011-09-02Merge branch 'gb/maint-am-stgit-author-to-from-fix'Junio C Hamano1-1/+1
2011-09-02Merge branch 'gb/maint-am-patch-format-error-message'Junio C Hamano1-1/+2
2011-08-29am: preliminary support for hg patchesGiuseppe Bilotta1-0/+34
2011-08-29am: fix stgit patch manglingGiuseppe Bilotta1-1/+1
2011-08-29am: format is in $patch_format, not parse_patchGiuseppe Bilotta1-1/+2
2011-08-25Merge branch 'js/i18n-scripts'Junio C Hamano1-17/+14
2011-08-18Merge branch 'db/am-skip-blank-at-the-beginning'Junio C Hamano1-3/+8
2011-08-18Merge branch 'ma/am-exclude'Junio C Hamano1-1/+2
2011-08-16Merge branch 'maint'Junio C Hamano1-0/+2
2011-08-16am: refresh the index at start and --resolvedJeff King1-0/+2
2011-08-11am: ignore leading whitespace before patchDavid Barr1-3/+8
2011-08-08git-am: take advantage of gettextln and eval_gettextln.Jon Seymour1-17/+14
2011-08-03am: pass exclude down to applymaximilian attems1-1/+2
2011-05-21i18n: git-am printf(1) message to eval_gettextÆvar Arnfjörð Bjarmason1-1/+1
2011-05-21i18n: git-am core say messagesÆvar Arnfjörð Bjarmason1-3/+3
2011-05-21i18n: git-am "Falling back" say messageÆvar Arnfjörð Bjarmason1-1/+1
2011-05-21i18n: git-am "Apply?" messageÆvar Arnfjörð Bjarmason1-1/+4
2011-05-21i18n: git-am clean_abort messagesÆvar Arnfjörð Bjarmason1-3/+3
2011-05-21i18n: git-am cannot_fallback messagesÆvar Arnfjörð Bjarmason1-3/+3
2011-05-21i18n: git-am die messagesÆvar Arnfjörð Bjarmason1-7/+7
2011-05-21i18n: git-am gettext + gettext to stderr messageÆvar Arnfjörð Bjarmason1-2/+5
2011-05-21i18n: git-am eval_gettext messagesÆvar Arnfjörð Bjarmason1-6/+6
2011-05-21i18n: git-am multi-line getttext $msg; echoÆvar Arnfjörð Bjarmason1-5/+5
2011-05-21i18n: git-am one-line gettext $msg; echoÆvar Arnfjörð Bjarmason1-3/+3
2011-05-21i18n: git-am add git-sh-i18nÆvar Arnfjörð Bjarmason1-0/+1
2010-12-28Merge branch 'jc/maint-rebase-rewrite-last-skip'Junio C Hamano1-7/+0
2010-12-22rebase --skip: correctly wrap-up when skipping the last patchJunio C Hamano1-7/+0
2010-12-22Merge branch 'jc/maint-am-abort-safely'Junio C Hamano1-2/+25
2010-12-21am --abort: keep unrelated commits since the last failure and warnJunio C Hamano1-2/+25
2010-10-21Sync with 1.7.3.2Junio C Hamano1-1/+1
2010-10-21Merge branch 'sn/doc-opt-notation' into maintJunio C Hamano1-1/+1
2010-10-13Merge branch 'maint'Junio C Hamano1-1/+1
2010-10-13shell portability: no "export VAR=VAL"Junio C Hamano1-1/+1
2010-10-08Use parentheses and `...' where appropriateŠtěpán Němec1-1/+1
2010-10-03git-am: fix detection of absolute paths for windowsPat Thoyts1-6/+6
2010-06-27Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano1-4/+10
2010-06-18Merge branch 'rr/am-help'Junio C Hamano1-10/+19
2010-06-16am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian1-4/+10
2010-06-02git am: Remove stray error message from sedRamkumar Ramachandra1-1/+7
2010-06-02git am: Display some help text when patch is emptyRamkumar Ramachandra1-0/+2
2010-06-02git am: Set cmdline globallyRamkumar Ramachandra1-9/+10
2010-05-31git-am: suggest what to do with superfluous patchesJan Krüger1-0/+2
2010-05-21Merge branch 'jc/am-3-show-corrupted-patch'Junio C Hamano1-1/+1
2010-04-14am -3: recover the diagnostic messages for corrupt patchesJunio C Hamano1-1/+1
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano1-0/+13
2010-03-12rebase: support automatic notes copyingThomas Rast1-1/+4
2010-03-12rebase: invoke post-rewrite hookThomas Rast1-0/+10
2010-03-10Merge branch 'sh/am-keep-cr'Junio C Hamano1-7/+25
2010-03-02Merge branch 'jn/maint-fix-pager'Junio C Hamano1-4/+1
2010-02-28git-am: Add am.keepcr and --no-keep-cr to override itStefan-W. Hahn1-5/+15
2010-02-28git-am: Add command line parameter `--keep-cr` passing it to git-mailsplitStefan-W. Hahn1-7/+15
2010-02-23am: remove rebase-apply directory before gcJonathan Nieder1-2/+1
2010-02-14am: Fix launching of pagerJonathan Nieder1-4/+1
2010-02-11am: switch --resolved to --continueJeff King1-2/+3
2010-01-25am: fix patch format detection for Thunderbird "Save As" emailsStephen Boyd1-1/+2
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano1-1/+5
2009-11-30Merge branch 'jc/maint-am-keep'Junio C Hamano1-5/+6
2009-11-27Remove dead code from "git am"Junio C Hamano1-5/+6
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano1-2/+2
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano1-2/+2
2009-11-22Merge branch 'ls/maint-mailinfo-no-inbody'Junio C Hamano1-3/+10
2009-11-20git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström1-3/+10
2009-11-13am -i, git-svn: use "git var GIT_PAGER"Jonathan Nieder1-1/+4
2009-09-25git-am: force egrep to use correct characters setChristian Himpel1-1/+1
2009-09-25git-am: fixed patch_format detection according to RFC2822Christian Himpel1-1/+1
2009-08-26am/mailinfo: Disable scissors processing by defaultJunio C Hamano1-6/+17
2009-08-21Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano1-1/+3
2009-08-21Merge branch 'bc/mailsplit-cr-at-eol'Junio C Hamano1-1/+7
2009-08-06git-am: print fair error message when format detection failsNicolas Sebrecht1-1/+5
2009-08-06am: allow individual e-mail files as inputJunio C Hamano1-0/+14
2009-08-05Allow mailsplit (and hence git-am) to handle mails with CRLF line-endingsJunio C Hamano1-1/+7
2009-08-05git apply: option to ignore whitespace differencesGiuseppe Bilotta1-1/+3
2009-07-06Merge branch 'gb/am-foreign'Junio C Hamano1-4/+127
2009-06-18am, rebase: teach quiet optionStephen Boyd1-7/+19
2009-06-18am: suppress apply errors when using 3-wayStephen Boyd1-1/+8
2009-06-13git-am: refactor 'cleaning up and aborting'Giuseppe Bilotta1-14/+13
2009-05-28git-am foreign patch support: StGIT supportGiuseppe Bilotta1-0/+57
2009-05-28git-am foreign patch support: autodetect some patch formatsGiuseppe Bilotta1-1/+39
2009-05-28git-am foreign patch support: introduce patch_formatGiuseppe Bilotta1-4/+33
2009-05-10am: simplify "sq" function by using "git rev-parse --sq-quote"Christian Couder1-5/+1
2009-04-18Work around ash "alternate value" expansion bugBen Jackson1-1/+1
2009-04-12git-am: teach git-am to apply a patch to an unborn branchNanako Shiraishi1-5/+24
2009-02-26git-am: make --abort less dangerousJunio C Hamano1-0/+7
2009-02-26git-am: Keep index in case of abort with dirty indexMichael J Gruber1-3/+10
2009-02-04Merge branch 'ns/am-slacker'Junio C Hamano1-1/+20
2009-01-28git-am: minor cleanupsJay Soffian1-8/+4
2009-01-25git-am: Add --ignore-date optionNanako Shiraishi1-0/+8
2009-01-25am: Add --committer-date-is-author-date optionJunio C Hamano1-1/+12
2009-01-23git-am: implement --reject option passed to git-applymartin f. krafft1-0/+3
2009-01-21Merge branch 'jf/am-failure-report'Junio C Hamano1-1/+1
2009-01-18git-am: re-fix the diag message printingJunio C Hamano1-1/+1
2009-01-17git-am: Make it easier to see which patch failedJonas Flodén1-1/+1
2009-01-14git-am: fix shell quotingJunio C Hamano1-1/+1
2009-01-12git-am: add --directory=<dir> optionJunio C Hamano1-4/+13
2008-12-05git-am: rename apply_opt_extra file to apply-optJunio C Hamano1-2/+2
2008-12-04git-am: propagate --3way options as wellJunio C Hamano1-2/+7
2008-12-04git-am: propagate -C<n>, -p<n> options as wellJunio C Hamano1-7/+7
2008-12-04git-am --whitespace: do not lose the command line optionJunio C Hamano1-4/+4
2008-08-16git-am: ignore --binary optionStephan Beyer1-12/+7
2008-07-30Replace uses of "git-var" with "git var"Todd Zullinger1-1/+1
2008-07-25git-am: Mention --abort in usage string part of OPTIONS_SPECStephan Beyer1-2/+1
2008-07-23git-am: Add colon before the subject that is printed out as being appliedStephan Beyer1-1/+1
2008-07-22git am --skip: clean the index while preserving local changesOlivier Marin1-3/+9
2008-07-21git-am: remove dash from help messageOlivier Marin1-1/+1
2008-07-21Rename .git/rebase to .git/rebase-applyJohannes Schindelin1-1/+1
2008-07-20Merge branch 'ns/am-abort'Junio C Hamano1-4/+17
2008-07-19git am --abortNanako Shiraishi1-4/+17
2008-07-16Merge branch 'sb/dashless'Junio C Hamano1-3/+3
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin1-3/+3
2008-07-14Merge branch 'jc/rebase-orig-head'Junio C Hamano1-0/+1
2008-07-13git-am/git-mailsplit: correct synopsis for reading from stdinStephan Beyer1-1/+1
2008-07-13Make usage strings dash-lessStephan Beyer1-3/+3
2008-07-13git-am: Do not exit silently if committer is unsetStephan Beyer1-1/+2
2008-07-07Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano1-0/+1
2008-06-17git-am: head -1 is obsolete and doesn't work on some new systemsAlejandro Mery1-1/+1
2008-05-21Merge branch 'maint-1.5.4' into maintJunio C Hamano1-1/+1
2008-05-19git-am: fix typo in usage messageJeff King1-1/+1
2008-04-19Merge branch 'jc/maint-rebase-am' into maintJunio C Hamano1-5/+14
2008-04-18Merge branch 'maint-1.5.4' into maintJunio C Hamano1-1/+1
2008-04-18am: POSIX portability fixJunio C Hamano1-1/+1
2008-04-16Merge branch 'maint-1.5.4' into maintJunio C Hamano1-2/+1
2008-04-16git-am: minor cleanupJunio C Hamano1-2/+1
2008-04-16rebase: do not munge commit log messageJunio C Hamano1-5/+14
2008-04-16Merge branch 'maint-1.5.4' into maintJunio C Hamano1-14/+10
2008-04-16git-am: cope better with an empty Subject: lineLinus Torvalds1-14/+10
2008-03-13remove use of "tail -n 1" and "tail -1"Jeff King1-1/+1
2008-03-05am: --rebasingJunio C Hamano1-2/+11
2008-03-05am: remove support for -d .dotestJunio C Hamano1-9/+5
2008-03-05am: read from the right mailbox when started from a subdirectoryJunio C Hamano1-2/+23
2008-03-01allow git-am to run in a subdirectoryJeff King1-0/+2
2008-02-03git-am: fix type in its usage stringJörg Sommer1-1/+1
2008-01-05git-am: Run git gc only once and not for every patch.Michael Stefaniuc1-2/+2
2007-12-05Merge branch 'maint'Junio C Hamano1-0/+5
2007-12-05git-am -i: report rewritten titleJunio C Hamano1-0/+5
2007-12-05Revert "git-am: catch missing author date early."Junio C Hamano1-2/+2
2007-12-02git-am: catch missing author date early.Junio C Hamano1-2/+2
2007-11-28Merge branch 'maint'Junio C Hamano1-4/+4
2007-11-28scripts: do not get confused with HEAD in work treeJunio C Hamano1-4/+4
2007-11-08git-am: -i does not take a string parameter.Junio C Hamano1-1/+1
2007-11-06Give git-am back the ability to add Signed-off-by lines.Johannes Sixt1-1/+1
2007-11-05Migrate git-am.sh to use git-rev-parse --parseoptPierre Habouzit1-45/+49
2007-10-18Merge branch 'jc/am-quiet'Shawn O. Pearce1-4/+0
2007-10-03Merge branch 'jc/autogc'Junio C Hamano1-0/+2
2007-10-01git-am: fix typo in the previous one.Junio C Hamano1-1/+1
2007-09-29git-am: make the output quieter.Junio C Hamano1-5/+1
2007-09-26apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin1-4/+2
2007-09-23Merge branch 'js/apply-build-ancestor'Junio C Hamano1-4/+2
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup1-1/+1
2007-09-18apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin1-4/+2
2007-09-06Invoke "git gc --auto" from commit, merge, am and rebase.Junio C Hamano1-0/+2
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-21 01:34:28 +0000