aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
Commit message (Expand)AuthorAge
* Merge branch 'js/maint-am-skip-performance-regression' into maintJunio C Hamano2015-09-17
|\
| * am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexJohannes Schindelin2015-09-09
| * Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-03
| |\
* | | Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-24
* | | Merge branch 'pt/am-abort-fix'Junio C Hamano2015-06-24
|\ \ \ | | |/ | |/|
| * | am --abort: keep unrelated commits on unborn branchPaul Tan2015-06-08
| * | am --abort: support aborting to unborn branchPaul Tan2015-06-08
| * | am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-08
| * | am --skip: support skipping while on unborn branchPaul Tan2015-06-08
| * | am -3: support 3way merge on unborn branchPaul Tan2015-06-08
| * | am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-08
* | | Merge branch 'rl/am-3way-config'Junio C Hamano2015-06-24
|\ \ \
| * | | git-am: add am.threeWay config variableRemi Lespinet2015-06-04
| * | | git-am.sh: fix initialization of the threeway variableRemi Lespinet2015-06-04
| | |/ | |/|
* | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-11
|\ \ \ | |/ / |/| |
| * | *.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy2014-12-01
| |/
* | git-am: add --message-id/--no-message-idPaolo Bonzini2014-11-25
|/
* Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-08
|\
| * comments: fix misuses of "nor"Justin Lebar2014-03-31
* | git-am.sh: use the $(...) construct for command substitutionElia Pinto2014-03-25
* | am: add the --gpg-sign optionNicolas Vigier2014-02-03
* | am: parse options in stuck-long modeNicolas Vigier2014-02-03
* | git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier2014-02-03
|/
* Merge branch 'jk/replace-perl-in-built-scripts'Junio C Hamano2013-12-05
|\
| * use @@PERL@@ in built scriptsJeff King2013-10-29
* | am: replace uses of --resolved with --continueKevin Bracey2013-06-27
* | am: handle stray $dotest directoryRamkumar Ramachandra2013-06-17
* | am: return control to caller, for housekeepingRamkumar Ramachandra2013-05-12
* | am: tighten a conditional that checks for $dotestRamkumar Ramachandra2013-05-12
* | git-am: show the final log message on "Applying:" indicatorSimon Ruderich2013-03-21
|/
* Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-05
|\
| * git-am: record full index line in the patch used while rebasingJunio C Hamano2013-01-31
* | Merge branch 'dl/am-hg-locale'Junio C Hamano2013-01-28
|\ \ | |/ |/|
| * am: invoke perl's strftime in C localeDmitry V. Levin2013-01-18
* | Merge branch 'nd/am-i18n-fix'Junio C Hamano2012-09-07
|\ \
| * | am: quote string for translation before passing to eval_gettextlnNguyễn Thái Ngọc Duy2012-08-22
* | | Merge branch 'jx/i18n-1.7.11'Junio C Hamano2012-07-31
|\ \ \
| * | | Remove dead code which contains bad gettext blockJiang Xin2012-07-26
| * | | i18n: am: mark more strings for translationJiang Xin2012-07-26
| * | | i18n: rebase: mark messages for translationJiang Xin2012-07-25
* | | | Merge branch 'pg/maint-1.7.9-am-where-is-patch'Junio C Hamano2012-07-22
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am: indicate where a failed patch is to be foundPaul Gortmaker2012-07-13
| * | Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano2012-03-12
| |\ \
* | | | am: don't call mailinfo if $rebasingMartin von Zweigbergk2012-06-26
* | | | am --rebasing: get patch body from commit, not from mailboxMartin von Zweigbergk2012-06-26
* | | | Merge branch 'jc/am-report-3way'Junio C Hamano2012-04-20
|\ \ \ \
| * | | | am -3: list the paths that needed 3-way fallbackJunio C Hamano2012-03-28
* | | | | Merge branch 'jb/am-include'Junio C Hamano2012-04-20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | am: support --include optionJohannes Berg2012-03-28
* | | | | am: officially deprecate -b/--binary optionJunio C Hamano2012-03-13
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-05 21:20:17 +0000