aboutsummaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/am-mailinfo-direct'Junio C Hamano2015-10-29
|\
| * am: make direct call to mailinfoJunio C Hamano2015-10-21
* | Merge branch 'tk/stripspace'Junio C Hamano2015-10-26
|\ \
| * | strbuf: make stripspace() part of strbufTobias Klauser2015-10-16
| |/
* | Merge branch 'rt/placeholder-in-usage'Junio C Hamano2015-10-26
|\ \
| * | am, credential-cache: add angle brackets to usage stringRalf Thielow2015-10-16
| |/
* | Merge branch 'jc/am-3-fallback-regression-fix'Junio C Hamano2015-10-26
|\ \
| * | am -3: do not let failed merge from completing the error codepathJunio C Hamano2015-10-09
| |/
* | Merge branch 'pt/am-builtin'Junio C Hamano2015-10-15
|\ \ | |/ |/|
| * am: configure gpg at startupRenee Margaret McConahy2015-09-30
* | Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-08
|\ \
| * | am: match --signoff to the original scripted versionJunio C Hamano2015-09-06
* | | rerere: release lockfile in non-writing functionsJeff King2015-09-01
* | | Merge branch 'jc/am-state-fix'Junio C Hamano2015-08-31
|\ \ \
| * | | write_file_v(): do not leave incomplete line at the endJunio C Hamano2015-08-25
| * | | write_file(): drop "fatal" parameterJunio C Hamano2015-08-24
| * | | builtin/am: make sure state files are textJunio C Hamano2015-08-24
| * | | builtin/am: introduce write_state_*() helper functionsJunio C Hamano2015-08-24
| |/ /
* | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-26
|\ \ \ | | |/ | |/|
| * | i18n: am: fix typo in description of -b optionJiang Xin2015-08-26
* | | Merge branch 'pt/am-builtin-abort-fix'Junio C Hamano2015-08-26
|\ \ \
| * | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan2015-08-19
| |/ /
* | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-25
| |/ |/|
* | am: let --signoff override --no-signoffPaul Tan2015-08-12
* | am: let command-line options override saved optionsPaul Tan2015-08-12
|/
* git-am: add am.threeWay config variableRemi Lespinet2015-08-04
* builtin-am: remove redirection to git-am.shPaul Tan2015-08-04
* builtin-am: check for valid committer identPaul Tan2015-08-04
* builtin-am: implement legacy -b/--binary optionPaul Tan2015-08-04
* builtin-am: implement -i/--interactivePaul Tan2015-08-04
* builtin-am: support and auto-detect mercurial patchesPaul Tan2015-08-04
* builtin-am: support and auto-detect StGit series filesPaul Tan2015-08-04
* builtin-am: support and auto-detect StGit patchesPaul Tan2015-08-04
* builtin-am: rerere supportPaul Tan2015-08-04
* builtin-am: invoke post-applypatch hookPaul Tan2015-08-04
* builtin-am: invoke pre-applypatch hookPaul Tan2015-08-04
* builtin-am: invoke applypatch-msg hookPaul Tan2015-08-04
* builtin-am: support automatic notes copyingPaul Tan2015-08-04
* builtin-am: invoke post-rewrite hookPaul Tan2015-08-04
* builtin-am: implement -S/--gpg-sign, commit.gpgsignPaul Tan2015-08-04
* builtin-am: implement --committer-date-is-author-datePaul Tan2015-08-04
* builtin-am: implement --ignore-datePaul Tan2015-08-04
* builtin-am: pass git-apply's options to git-applyPaul Tan2015-08-04
* builtin-am: implement --[no-]scissorsPaul Tan2015-08-04
* builtin-am: support --keep-cr, am.keepcrPaul Tan2015-08-04
* builtin-am: implement --[no-]message-id, am.messageidPaul Tan2015-08-04
* builtin-am: implement -k/--keep, --keep-non-patchPaul Tan2015-08-04
* builtin-am: implement -u/--utf8Paul Tan2015-08-04
* builtin-am: handle stray state directoryPaul Tan2015-08-04
* builtin-am: bypass git-mailinfo when --rebasingPaul Tan2015-08-04