summaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-031-1/+1
|\
| * diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-211-1/+1
| * Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-031-16/+33
| |\
| * \ Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-031-2/+2
| |\ \
| * \ \ Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-031-1/+1
| |\ \ \
| * \ \ \ Merge branch 'pt/am-builtin' into maintJunio C Hamano2015-10-161-1/+12
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-281-26/+11
|\ \ \ \ \ \
| * | | | | | strbuf: give strbuf_getline() to the "most text friendly" variantjc/strbuf-getlineJunio C Hamano2016-01-151-4/+4
| * | | | | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-7/+7
| * | | | | | strbuf: make strbuf_getline_crlf() globalJunio C Hamano2016-01-141-15/+0
* | | | | | | am: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
|/ / / / / /
* | | | | | Convert struct object to object_idbrian m. carlson2015-11-201-1/+1
* | | | | | 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
View Lorry Controller Status