path: root/builtin/am.c
AgeCommit message (Expand)Author
2016-07-19Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Junio C Hamano
2016-07-19Merge branch 'jk/write-file'Junio C Hamano
2016-07-08am: counteract gender biasJohannes Schindelin
2016-07-08use write_file_buf where applicableJeff King
2016-07-08am: ignore return value of write_file()René Scharfe
2016-06-06am: support --patch-format=mboxrdEric Wong
2016-05-09builtin/am.c: use error_errno()Nguyễn Thái Ngọc Duy
2016-02-24Merge branch 'jc/am-i-v-fix'Junio C Hamano
2016-02-17am -i: fix "v"iewJunio C Hamano
2016-02-03Merge branch 'nd/diff-with-path-params'Junio C Hamano
2016-01-29Merge branch 'jc/strbuf-getline'Junio C Hamano
2016-01-21diff: make -O and --output work in subdirectoryDuy Nguyen
2016-01-15strbuf: give strbuf_getline() to the "most text friendly" variantJunio C Hamano
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano
2016-01-14strbuf: make strbuf_getline_crlf() globalJunio C Hamano
2016-01-13am: release pack files before garbage-collectingJohannes Schindelin
2015-11-20Convert struct object to object_idbrian m. carlson
2015-11-03Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano
2015-11-03Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano
2015-11-03Merge branch 'tk/stripspace' into maintJunio C Hamano
2015-10-29Merge branch 'jc/am-mailinfo-direct'Junio C Hamano
2015-10-26Merge branch 'tk/stripspace'Junio C Hamano
2015-10-26Merge branch 'rt/placeholder-in-usage'Junio C Hamano
2015-10-26Merge branch 'jc/am-3-fallback-regression-fix'Junio C Hamano
2015-10-21am: make direct call to mailinfoJunio C Hamano
2015-10-16Merge branch 'pt/am-builtin' into maintJunio C Hamano
2015-10-16am, credential-cache: add angle brackets to usage stringRalf Thielow
2015-10-16strbuf: make stripspace() part of strbufTobias Klauser
2015-10-15Merge branch 'pt/am-builtin'Junio C Hamano
2015-10-09am -3: do not let failed merge from completing the error codepathJunio C Hamano
2015-09-30am: configure gpg at startupRenee Margaret McConahy
2015-09-08Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano
2015-09-07am: match --signoff to the original scripted versionJunio C Hamano
2015-09-01rerere: release lockfile in non-writing functionsJeff King
2015-08-31Merge branch 'jc/am-state-fix'Junio C Hamano
2015-08-26Merge branch 'pt/am-builtin'Junio C Hamano
2015-08-26Merge branch 'pt/am-builtin-abort-fix'Junio C Hamano
2015-08-26i18n: am: fix typo in description of -b optionJiang Xin
2015-08-25Merge branch 'mh/tempfile'Junio C Hamano
2015-08-25write_file_v(): do not leave incomplete line at the endJunio C Hamano
2015-08-24write_file(): drop "fatal" parameterJunio C Hamano
2015-08-24builtin/am: make sure state files are textJunio C Hamano
2015-08-24builtin/am: introduce write_state_*() helper functionsJunio C Hamano
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan
2015-08-12am: let --signoff override --no-signoffPaul Tan
2015-08-12am: let command-line options override saved optionsPaul Tan
2015-08-05git-am: add am.threeWay config variableRemi Lespinet
2015-08-05builtin-am: remove redirection to git-am.shPaul Tan
2015-08-05builtin-am: check for valid committer identPaul Tan
2015-08-05builtin-am: implement legacy -b/--binary optionPaul Tan