summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* am -i: fix "v"iewjc/am-i-v-fixJunio C Hamano2016-02-171-1/+1
* pager: factor out a helper to prepare a child process to run the pagerJunio C Hamano2016-02-172-6/+14
* pager: lose a separate argv[]Junio C Hamano2016-02-161-3/+1
* Merge branch 'pt/am-builtin'Junio C Hamano2015-08-1212-15/+2432
|\
| * git-am: add am.threeWay config variableRemi Lespinet2015-08-044-2/+34
| * builtin-am: remove redirection to git-am.shPaul Tan2015-08-044-22/+1
| * 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
| * builtin-am: implement --rebasing modePaul Tan2015-08-041-4/+26
| * builtin-am: implement --3wayPaul Tan2015-08-041-4/+150
| * cache-tree: introduce write_index_as_tree()Paul Tan2015-08-042-12/+18
| * builtin-am: implement -s/--signoffPaul Tan2015-08-041-0/+12
| * builtin-am: exit with user friendly message on failurePaul Tan2015-08-041-4/+26
| * builtin-am: implement -q/--quietPaul Tan2015-08-041-3/+28
| * builtin-am: reject patches when there's a session in progressPaul Tan2015-08-041-0/+15
| * builtin-am: implement --abortPaul Tan2015-08-041-3/+100
| * builtin-am: implement --skipPaul Tan2015-08-041-2/+121
| * builtin-am: don't parse mail when resumingPaul Tan2015-08-041-9/+25
| * builtin-am: implement --resolved/--continuePaul Tan2015-08-041-1/+71
| * builtin-am: refuse to apply patches if index is dirtyPaul Tan2015-08-041-0/+45
| * builtin-am: implement committing applied patchPaul Tan2015-08-041-4/+51
| * builtin-am: apply patch with git-applyPaul Tan2015-08-041-1/+71
| * builtin-am: extract patch and commit info with git-mailinfoPaul Tan2015-08-041-0/+317
| * builtin-am: auto-detect mbox patchesPaul Tan2015-08-041-0/+109
| * builtin-am: split out mbox/maildir patches with git-mailsplitPaul Tan2015-08-041-3/+104
| * builtin-am: implement patch queue mechanismPaul Tan2015-08-041-0/+177
| * builtin-am: implement skeletal builtin amPaul Tan2015-08-044-0/+37
| * wrapper: implement xfopen()Paul Tan2015-08-042-0/+22
| * wrapper: implement xopen()Paul Tan2015-08-042-0/+36
View Lorry Controller Status