summaryrefslogtreecommitdiff
path: root/builtin/am.c
AgeCommit message (Expand)AuthorFilesLines
2015-10-16strbuf: make stripspace() part of strbufLibravatar Tobias Klauser1-1/+1
2015-10-15Merge branch 'pt/am-builtin'Libravatar Junio C Hamano1-1/+12
2015-10-09am -3: do not let failed merge from completing the error codepathLibravatar Junio C Hamano1-16/+33
2015-09-30am: configure gpg at startupLibravatar Renee Margaret McConahy1-1/+12
2015-09-08Merge branch 'jc/builtin-am-signoff-regression-fix'Libravatar Junio C Hamano1-2/+29
2015-09-06am: match --signoff to the original scripted versionLibravatar Junio C Hamano1-2/+29
2015-09-01rerere: release lockfile in non-writing functionsLibravatar Jeff King1-5/+0
2015-08-31Merge branch 'jc/am-state-fix'Libravatar Junio C Hamano1-27/+41
2015-08-26Merge branch 'pt/am-builtin'Libravatar Junio C Hamano1-1/+1
2015-08-26Merge branch 'pt/am-builtin-abort-fix'Libravatar Junio C Hamano1-13/+36
2015-08-26i18n: am: fix typo in description of -b optionLibravatar Jiang Xin1-1/+1
2015-08-25Merge branch 'mh/tempfile'Libravatar Junio C Hamano1-0/+1
2015-08-25write_file_v(): do not leave incomplete line at the endLibravatar Junio C Hamano1-8/+2
2015-08-24write_file(): drop "fatal" parameterLibravatar Junio C Hamano1-2/+2
2015-08-24builtin/am: make sure state files are textLibravatar Junio C Hamano1-2/+8
2015-08-24builtin/am: introduce write_state_*() helper functionsLibravatar Junio C Hamano1-27/+41
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexLibravatar Paul Tan1-13/+36
2015-08-12am: let --signoff override --no-signoffLibravatar Paul Tan1-3/+25
2015-08-12am: let command-line options override saved optionsLibravatar Paul Tan1-4/+12
2015-08-04git-am: add am.threeWay config variableLibravatar Remi Lespinet1-0/+2
2015-08-04builtin-am: remove redirection to git-am.shLibravatar Paul Tan1-15/+0
2015-08-04builtin-am: check for valid committer identLibravatar Paul Tan1-0/+3
2015-08-04builtin-am: implement legacy -b/--binary optionLibravatar Paul Tan1-0/+7
2015-08-04builtin-am: implement -i/--interactiveLibravatar Paul Tan1-1/+104
2015-08-04builtin-am: support and auto-detect mercurial patchesLibravatar Paul Tan1-1/+73
2015-08-04builtin-am: support and auto-detect StGit series filesLibravatar Paul Tan1-1/+58
2015-08-04builtin-am: support and auto-detect StGit patchesLibravatar Paul Tan1-1/+131
2015-08-04builtin-am: rerere supportLibravatar Paul Tan1-0/+25
2015-08-04builtin-am: invoke post-applypatch hookLibravatar Paul Tan1-0/+2
2015-08-04builtin-am: invoke pre-applypatch hookLibravatar Paul Tan1-0/+3
2015-08-04builtin-am: invoke applypatch-msg hookLibravatar Paul Tan1-0/+24
2015-08-04builtin-am: support automatic notes copyingLibravatar Paul Tan1-0/+60
2015-08-04builtin-am: invoke post-rewrite hookLibravatar Paul Tan1-0/+55
2015-08-04builtin-am: implement -S/--gpg-sign, commit.gpgsignLibravatar Paul Tan1-1/+10
2015-08-04builtin-am: implement --committer-date-is-author-dateLibravatar Paul Tan1-0/+8
2015-08-04builtin-am: implement --ignore-dateLibravatar Paul Tan1-1/+5
2015-08-04builtin-am: pass git-apply's options to git-applyLibravatar Paul Tan1-0/+45
2015-08-04builtin-am: implement --[no-]scissorsLibravatar Paul Tan1-0/+48
2015-08-04builtin-am: support --keep-cr, am.keepcrLibravatar Paul Tan1-6/+23
2015-08-04builtin-am: implement --[no-]message-id, am.messageidLibravatar Paul Tan1-0/+13
2015-08-04builtin-am: implement -k/--keep, --keep-non-patchLibravatar Paul Tan1-0/+50
2015-08-04builtin-am: implement -u/--utf8Libravatar Paul Tan1-0/+11
2015-08-04builtin-am: handle stray state directoryLibravatar Paul Tan1-0/+17
2015-08-04builtin-am: bypass git-mailinfo when --rebasingLibravatar Paul Tan1-1/+133
2015-08-04builtin-am: implement --rebasing modeLibravatar Paul Tan1-4/+26
2015-08-04builtin-am: implement --3wayLibravatar Paul Tan1-4/+150
2015-08-04builtin-am: implement -s/--signoffLibravatar Paul Tan1-0/+12
2015-08-04builtin-am: exit with user friendly message on failureLibravatar Paul Tan1-4/+26
2015-08-04builtin-am: implement -q/--quietLibravatar Paul Tan1-3/+28
2015-08-04builtin-am: reject patches when there's a session in progressLibravatar Paul Tan1-0/+15