| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'rl/am-3way-config' | Junio C Hamano | 2015-06-24 | 1 | -0/+10 |
| |\ | |||||
| | * | git-am: add am.threeWay config variablerl/am-3way-config | Remi Lespinet | 2015-06-04 | 1 | -0/+9 |
| | * | git-am.sh: fix initialization of the threeway variable | Remi Lespinet | 2015-06-04 | 1 | -0/+1 |
| * | | Merge branch 'nd/multiple-work-trees' | Junio C Hamano | 2015-05-11 | 1 | -11/+11 |
| |\ \ | |/ |/| | |||||
| | * | *.sh: avoid hardcoding $GIT_DIR/hooks/... | Nguyễn Thái Ngọc Duy | 2014-12-01 | 1 | -11/+11 |
| * | | git-am: add --message-id/--no-message-idpb/am-message-id-footer | Paolo Bonzini | 2014-11-25 | 1 | -2/+19 |
| |/ | |||||
| * | Merge branch 'jl/nor-or-nand-and' | Junio C Hamano | 2014-04-08 | 1 | -1/+1 |
| |\ | |||||
| | * | comments: fix misuses of "nor" | Justin Lebar | 2014-03-31 | 1 | -1/+1 |
| * | | git-am.sh: use the $(...) construct for command substitution | Elia Pinto | 2014-03-25 | 1 | -15/+15 |
| * | | am: add the --gpg-sign option | Nicolas Vigier | 2014-02-03 | 1 | -1/+8 |
| * | | am: parse options in stuck-long mode | Nicolas Vigier | 2014-02-03 | 1 | -9/+9 |
| * | | git-sh-setup.sh: add variable to use the stuck-long mode | Nicolas Vigier | 2014-02-03 | 1 | -0/+1 |
| |/ | |||||
| * | Merge branch 'jk/replace-perl-in-built-scripts' | Junio C Hamano | 2013-12-05 | 1 | -2/+2 |
| |\ | |||||
| | * | use @@PERL@@ in built scriptsjk/replace-perl-in-built-scripts | Jeff King | 2013-10-29 | 1 | -2/+2 |
| * | | am: replace uses of --resolved with --continue | Kevin Bracey | 2013-06-27 | 1 | -4/+4 |
| * | | am: handle stray $dotest directory | Ramkumar Ramachandra | 2013-06-17 | 1 | -0/+17 |
| * | | am: return control to caller, for housekeeping | Ramkumar Ramachandra | 2013-05-12 | 1 | -2/+7 |
| * | | am: tighten a conditional that checks for $dotest | Ramkumar Ramachandra | 2013-05-12 | 1 | -1/+3 |
| * | | git-am: show the final log message on "Applying:" indicator | Simon Ruderich | 2013-03-21 | 1 | -7/+7 |
| |/ | |||||
| * | Merge branch 'jc/fake-ancestor-with-non-blobs' | Junio C Hamano | 2013-02-05 | 1 | -1/+1 |
| |\ | |||||
| | * | git-am: record full index line in the patch used while rebasing | Junio C Hamano | 2013-01-31 | 1 | -1/+1 |
| * | | Merge branch 'dl/am-hg-locale' | Junio C Hamano | 2013-01-28 | 1 | -1/+1 |
| |\ \ | |/ |/| | |||||
| | * | am: invoke perl's strftime in C locale | Dmitry V. Levin | 2013-01-18 | 1 | -1/+1 |
| * | | Merge branch 'nd/am-i18n-fix' | Junio C Hamano | 2012-09-07 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | am: quote string for translation before passing to eval_gettextln | Nguyễn Thái Ngọc Duy | 2012-08-22 | 1 | -2/+2 |
| * | | | Merge branch 'jx/i18n-1.7.11' | Junio C Hamano | 2012-07-31 | 1 | -12/+8 |
| |\ \ \ | |||||
| | * | | | Remove dead code which contains bad gettext block | Jiang Xin | 2012-07-26 | 1 | -3/+0 |
| | * | | | i18n: am: mark more strings for translation | Jiang Xin | 2012-07-26 | 1 | -6/+5 |
| | * | | | i18n: rebase: mark messages for translation | Jiang Xin | 2012-07-25 | 1 | -3/+3 |
| * | | | | Merge branch 'pg/maint-1.7.9-am-where-is-patch' | Junio C Hamano | 2012-07-22 | 1 | -0/+5 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| | * | | am: indicate where a failed patch is to be found | Paul Gortmaker | 2012-07-13 | 1 | -0/+5 |
| | * | | Merge branch 'jc/am-3-nonstandard-popt' into maint | Junio C Hamano | 2012-03-12 | 1 | -4/+7 |
| | |\ \ | |||||
| * | | | | am: don't call mailinfo if $rebasing | Martin von Zweigbergk | 2012-06-26 | 1 | -23/+24 |
| * | | | | am --rebasing: get patch body from commit, not from mailbox | Martin von Zweigbergk | 2012-06-26 | 1 | -0/+1 |
| * | | | | Merge branch 'jc/am-report-3way' | Junio C Hamano | 2012-04-20 | 1 | -0/+6 |
| |\ \ \ \ | |||||
| | * | | | | am -3: list the paths that needed 3-way fallback | Junio C Hamano | 2012-03-28 | 1 | -0/+6 |
| * | | | | | Merge branch 'jb/am-include' | Junio C Hamano | 2012-04-20 | 1 | -1/+2 |
| |\ \ \ \ \ | |/ / / / |/| | | | | |||||
| | * | | | | am: support --include option | Johannes Berg | 2012-03-28 | 1 | -1/+2 |
| * | | | | | am: officially deprecate -b/--binary option | Junio C Hamano | 2012-03-13 | 1 | -2/+2 |
| * | | | | | git-am: error out when seeing -b/--binary | Thomas Rast | 2012-03-12 | 1 | -1/+3 |
| * | | | | | Merge branch 'jc/am-3-nonstandard-popt' | Junio C Hamano | 2012-03-04 | 1 | -4/+7 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | am -3: allow nonstandard -p<num> option | Junio C Hamano | 2012-02-22 | 1 | -4/+7 |
| * | | | | | Merge branch 'maint' | Junio C Hamano | 2012-02-26 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | am: don't infloop for an empty input file | Jim Meyering | 2012-02-26 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge branch 'tr/maint-mailinfo' | Junio C Hamano | 2012-01-29 | 1 | -4/+16 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | am: learn passing -b to mailinfo | Thomas Rast | 2012-01-16 | 1 | -4/+16 |
| * | | | | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2011-12-09 | 1 | -7/+0 |
| |\ \ \ \ | |||||
| | * | | | | am: don't persist keepcr flag | Martin von Zweigbergk | 2011-12-09 | 1 | -7/+0 |
| * | | | | | Merge branch 'gb/am-hg-patch' | Junio C Hamano | 2011-10-05 | 1 | -0/+34 |
| |\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| | * | | | am: preliminary support for hg patches | Giuseppe Bilotta | 2011-08-29 | 1 | -0/+34 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |