summaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/am-mailinfo-direct'Junio C Hamano2015-10-291-19/+23
|\
| * am: make direct call to mailinfojc/am-mailinfo-directJunio C Hamano2015-10-211-19/+23
* | Merge branch 'tk/stripspace'Junio C Hamano2015-10-261-1/+1
|\ \
| * | strbuf: make stripspace() part of strbufTobias Klauser2015-10-161-1/+1
| |/
* | Merge branch 'rt/placeholder-in-usage'Junio C Hamano2015-10-261-2/+2
|\ \
| * | am, credential-cache: add angle brackets to usage stringrt/placeholder-in-usageRalf Thielow2015-10-161-2/+2
| |/
* | Merge branch 'jc/am-3-fallback-regression-fix'Junio C Hamano2015-10-261-16/+33
|\ \
| * | am -3: do not let failed merge from completing the error codepathjc/am-3-fallback-regression-fixJunio C Hamano2015-10-091-16/+33
| |/
* | Merge branch 'pt/am-builtin'Junio C Hamano2015-10-151-1/+12
|\ \ | |/ |/|
| * am: configure gpg at startuppt/am-builtinRenee Margaret McConahy2015-09-301-1/+12
* | Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-081-2/+29
|\ \
| * | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fixJunio C Hamano2015-09-061-2/+29
* | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-011-5/+0
* | | Merge branch 'jc/am-state-fix'Junio C Hamano2015-08-311-27/+41
|\ \ \
| * | | write_file_v(): do not leave incomplete line at the endJunio C Hamano2015-08-251-8/+2
| * | | write_file(): drop "fatal" parameterJunio C Hamano2015-08-241-2/+2
| * | | builtin/am: make sure state files are textJunio C Hamano2015-08-241-2/+8
| * | | builtin/am: introduce write_state_*() helper functionsJunio C Hamano2015-08-241-27/+41
| |/ /
* | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-261-1/+1
|\ \ \ | | |/ | |/|
| * | i18n: am: fix typo in description of -b optionJiang Xin2015-08-261-1/+1
* | | Merge branch 'pt/am-builtin-abort-fix'Junio C Hamano2015-08-261-13/+36
|\ \ \
| * | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexpt/am-builtin-abort-fixPaul Tan2015-08-191-13/+36
| |/ /
* | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-251-0/+1
| |/ |/|
* | am: let --signoff override --no-signoffpt/am-builtin-optionsPaul Tan2015-08-121-3/+25
* | am: let command-line options override saved optionsPaul Tan2015-08-121-4/+12
|/
* git-am: add am.threeWay config variableRemi Lespinet2015-08-041-0/+2
* builtin-am: remove redirection to git-am.shPaul Tan2015-08-041-15/+0
* builtin-am: check for valid committer identPaul Tan2015-08-041-0/+3
* builtin-am: implement legacy -b/--binary optionPaul Tan2015-08-041-0/+7
* builtin-am: implement -i/--interactivePaul Tan2015-08-041-1/+104
* builtin-am: support and auto-detect mercurial patchesPaul Tan2015-08-041-1/+73
* builtin-am: support and auto-detect StGit series filesPaul Tan2015-08-041-1/+58
* builtin-am: support and auto-detect StGit patchesPaul Tan2015-08-041-1/+131
* builtin-am: rerere supportPaul Tan2015-08-041-0/+25
* builtin-am: invoke post-applypatch hookPaul Tan2015-08-041-0/+2
* builtin-am: invoke pre-applypatch hookPaul Tan2015-08-041-0/+3
* builtin-am: invoke applypatch-msg hookPaul Tan2015-08-041-0/+24
* builtin-am: support automatic notes copyingPaul Tan2015-08-041-0/+60
* builtin-am: invoke post-rewrite hookPaul Tan2015-08-041-0/+55
* builtin-am: implement -S/--gpg-sign, commit.gpgsignPaul Tan2015-08-041-1/+10
* builtin-am: implement --committer-date-is-author-datePaul Tan2015-08-041-0/+8
* builtin-am: implement --ignore-datePaul Tan2015-08-041-1/+5
* builtin-am: pass git-apply's options to git-applyPaul Tan2015-08-041-0/+45
* builtin-am: implement --[no-]scissorsPaul Tan2015-08-041-0/+48
* builtin-am: support --keep-cr, am.keepcrPaul Tan2015-08-041-6/+23
* builtin-am: implement --[no-]message-id, am.messageidPaul Tan2015-08-041-0/+13
* builtin-am: implement -k/--keep, --keep-non-patchPaul Tan2015-08-041-0/+50
* builtin-am: implement -u/--utf8Paul Tan2015-08-041-0/+11
* builtin-am: handle stray state directoryPaul Tan2015-08-041-0/+17
* builtin-am: bypass git-mailinfo when --rebasingPaul Tan2015-08-041-1/+133
View Lorry Controller Status