summaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/use-opt-int-set-f'Junio C Hamano2018-06-011-6/+6
|\
| * Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy2018-05-241-6/+6
* | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-4/+4
|\ \
| * | builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algobrian m. carlson2018-05-021-4/+4
* | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-10/+10
| |/ |/|
* | exec_cmd: rename to use dash in file nameStefan Beller2018-04-111-1/+1
|/
* Merge branch 'sb/object-store'Junio C Hamano2018-04-111-1/+1
|\
| * object-store: close all packs upon clearing the object storeStefan Beller2018-03-261-1/+1
* | cache-tree: convert write_*_as_tree to object_idbrian m. carlson2018-03-141-4/+4
* | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-061-4/+43
|\ \
| * | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patchNguyễn Thái Ngọc Duy2018-02-121-0/+4
| * | rebase: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-0/+11
| * | am: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-4/+28
* | | Merge branch 'nd/am-quit'Junio C Hamano2018-02-281-2/+10
|\ \ \
| * | | am: support --quitnd/am-quitNguyễn Thái Ngọc Duy2018-02-141-2/+10
| | |/ | |/|
* | | Merge branch 'po/object-id'Junio C Hamano2018-02-151-2/+2
|\ \ \ | |/ / |/| |
| * | commit: convert commit_tree* to object_idPatryk Obara2018-01-301-2/+2
| |/
* | sq_quote_argv: drop maxlen parameterJeff King2018-01-161-1/+1
|/
* Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano2018-01-051-37/+0
|\
| * Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2017-12-221-37/+0
| |\
| | * move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren2017-12-221-37/+0
* | | Merge branch 'rs/am-builtin-leakfix'Junio C Hamano2017-12-271-3/+7
|\ \ \ | |/ / |/| |
| * | am: release strbuf after use in split_mail_mbox()rs/am-builtin-leakfixRené Scharfe2017-12-071-3/+7
* | | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-131-1/+1
|\ \ \
| * | | Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
* | | | Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano2017-11-151-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty2017-11-061-1/+1
* | | | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-5/+5
|\ \ \ \
| * | | | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-5/+5
| * | | | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-4/+4
| * | | | diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-11-061-8/+8
|\ \ \ \ | | |/ / | |/| |
| * | | refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-161-1/+1
| * | | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-161-7/+7
| |/ /
* | | apply: move lockfile into `apply_state`Martin Ågren2017-10-061-2/+1
* | | treewide: prefer lockfiles on the stackMartin Ågren2017-10-061-13/+11
|/ /
* | am: release strbuf after use in safe_to_abort()Rene Scharfe2017-09-071-0/+1
* | am: release strbuf on error return in hg_patch_to_mail()Rene Scharfe2017-09-071-10/+19
* | am: release strbufs after use in detect_patch_format()Rene Scharfe2017-09-071-2/+2
* | pack: move pack-closing functionsJonathan Tan2017-08-231-0/+1
* | Merge branch 'pw/am-signoff'Junio C Hamano2017-08-221-25/+1
|\ \
| * | am: fix signoff when other trailers are presentpw/am-signoffPhillip Wood2017-08-081-25/+1
| * | Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano2017-06-051-0/+3
| |\ \
| * \ \ Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano2017-06-051-1/+1
| |\ \ \
| * \ \ \ Merge branch 'js/plug-leaks' into maintJunio C Hamano2017-06-041-9/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/am-leakfix' into maintJunio C Hamano2017-06-041-20/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ja/do-not-ask-needless-questions' into maintJunio C Hamano2017-06-041-2/+3
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano2017-08-221-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | am: remember --rerere-autoupdate settingPhillip Wood2017-08-021-0/+12
* | | | | | | | | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-171-3/+3
|/ / / / / / / /
View Lorry Controller Status