diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-13 00:09:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-13 00:09:55 +0300 |
| commit | 7aa2da616208a51ec51ce3639fe6abd9631b74db (patch) | |
| tree | ecec6305390773f8f263f94e93d9c7bbf10521c8 /branch.c | |
| parent | c1e5ca90dba834246e1fbac1c3ce9899873c22a5 (diff) | |
| parent | e97a5e765db06995c3b027a5d7dceb6b4f2cba02 (diff) | |
Merge branch 'pt/am-builtin'
Rewrite "am" in "C".
* pt/am-builtin: (46 commits)
git-am: add am.threeWay config variable
builtin-am: remove redirection to git-am.sh
builtin-am: check for valid committer ident
builtin-am: implement legacy -b/--binary option
builtin-am: implement -i/--interactive
builtin-am: support and auto-detect mercurial patches
builtin-am: support and auto-detect StGit series files
builtin-am: support and auto-detect StGit patches
builtin-am: rerere support
builtin-am: invoke post-applypatch hook
builtin-am: invoke pre-applypatch hook
builtin-am: invoke applypatch-msg hook
builtin-am: support automatic notes copying
builtin-am: invoke post-rewrite hook
builtin-am: implement -S/--gpg-sign, commit.gpgsign
builtin-am: implement --committer-date-is-author-date
builtin-am: implement --ignore-date
builtin-am: pass git-apply's options to git-apply
builtin-am: implement --[no-]scissors
builtin-am: support --keep-cr, am.keepcr
...
Diffstat (limited to 'branch.c')
0 files changed, 0 insertions, 0 deletions