summaryrefslogtreecommitdiff
path: root/builtin/am.c
AgeCommit message (Expand)AuthorFilesLines
2016-07-28Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintLibravatar Junio C Hamano1-8/+8
2016-07-08am: counteract gender biasLibravatar Johannes Schindelin1-8/+8
2016-05-09builtin/am.c: use error_errno()Libravatar Nguyễn Thái Ngọc Duy1-6/+5
2016-02-24Merge branch 'jc/am-i-v-fix'Libravatar Junio C Hamano1-1/+1
2016-02-17am -i: fix "v"iewLibravatar Junio C Hamano1-1/+1
2016-02-03Merge branch 'nd/diff-with-path-params'Libravatar Junio C Hamano1-1/+1
2016-01-28Merge branch 'jc/strbuf-getline'Libravatar Junio C Hamano1-26/+11
2016-01-21diff: make -O and --output work in subdirectoryLibravatar Duy Nguyen1-1/+1
2016-01-15strbuf: give strbuf_getline() to the "most text friendly" variantLibravatar Junio C Hamano1-4/+4
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Libravatar Junio C Hamano1-7/+7
2016-01-14strbuf: make strbuf_getline_crlf() globalLibravatar Junio C Hamano1-15/+0
2016-01-13am: release pack files before garbage-collectingLibravatar Johannes Schindelin1-0/+1
2015-11-20Convert struct object to object_idLibravatar brian m. carlson1-1/+1
2015-11-03Merge branch 'jc/am-3-fallback-regression-fix' into maintLibravatar Junio C Hamano1-16/+33
2015-11-03Merge branch 'rt/placeholder-in-usage' into maintLibravatar Junio C Hamano1-2/+2
2015-11-03Merge branch 'tk/stripspace' into maintLibravatar Junio C Hamano1-1/+1
2015-10-29Merge branch 'jc/am-mailinfo-direct'Libravatar Junio C Hamano1-19/+23
2015-10-26Merge branch 'tk/stripspace'Libravatar Junio C Hamano1-1/+1
2015-10-26Merge branch 'rt/placeholder-in-usage'Libravatar Junio C Hamano1-2/+2
2015-10-26Merge branch 'jc/am-3-fallback-regression-fix'Libravatar Junio C Hamano1-16/+33
2015-10-21am: make direct call to mailinfoLibravatar Junio C Hamano1-19/+23
2015-10-16Merge branch 'pt/am-builtin' into maintLibravatar Junio C Hamano1-1/+12
2015-10-16am, credential-cache: add angle brackets to usage stringLibravatar Ralf Thielow1-2/+2
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 16:19:38 +0000