Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/complete-config-vars' | Junio C Hamano | 2018-06-25 | 1 | -5/+1 |
|\ | |||||
| * | am: move advice.amWorkDir parsing back to advice.c | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -5/+1 |
* | | Merge branch 'nd/use-opt-int-set-f' | Junio C Hamano | 2018-06-01 | 1 | -6/+6 |
|\ \ | |||||
| * | | Use OPT_SET_INT_F() for cmdline option specification | Nguyễn Thái Ngọc Duy | 2018-05-24 | 1 | -6/+6 |
| |/ | |||||
* | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-05-30 | 1 | -4/+4 |
|\ \ | |||||
| * | | builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algo | brian m. carlson | 2018-05-02 | 1 | -4/+4 |
* | | | Replace all die("BUG: ...") calls by BUG() ones | Johannes Schindelin | 2018-05-06 | 1 | -10/+10 |
| |/ |/| | |||||
* | | exec_cmd: rename to use dash in file name | Stefan Beller | 2018-04-11 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'sb/object-store' | Junio C Hamano | 2018-04-11 | 1 | -1/+1 |
|\ | |||||
| * | object-store: close all packs upon clearing the object store | Stefan Beller | 2018-03-26 | 1 | -1/+1 |
* | | cache-tree: convert write_*_as_tree to object_id | brian m. carlson | 2018-03-14 | 1 | -4/+4 |
* | | Merge branch 'nd/rebase-show-current-patch' | Junio C Hamano | 2018-03-06 | 1 | -4/+43 |
|\ \ | |||||
| * | | rebase: introduce and use pseudo-ref REBASE_HEAD | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -0/+4 |
| * | | rebase: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -0/+11 |
| * | | am: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -4/+28 |
* | | | Merge branch 'nd/am-quit' | Junio C Hamano | 2018-02-28 | 1 | -2/+10 |
|\ \ \ | |||||
| * | | | am: support --quit | Nguyễn Thái Ngọc Duy | 2018-02-14 | 1 | -2/+10 |
| | |/ | |/| | |||||
* | | | Merge branch 'po/object-id' | Junio C Hamano | 2018-02-15 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | commit: convert commit_tree* to object_id | Patryk Obara | 2018-01-30 | 1 | -2/+2 |
| |/ | |||||
* / | sq_quote_argv: drop maxlen parameter | Jeff King | 2018-01-16 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'ew/empty-merge-with-dirty-index' | Junio C Hamano | 2018-01-05 | 1 | -37/+0 |
|\ | |||||
| * | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with... | Junio C Hamano | 2017-12-22 | 1 | -37/+0 |
| |\ | |||||
| | * | move index_has_changes() from builtin/am.c to merge.c for reuse | Elijah Newren | 2017-12-22 | 1 | -37/+0 |
* | | | Merge branch 'rs/am-builtin-leakfix' | Junio C Hamano | 2017-12-27 | 1 | -3/+7 |
|\ \ \ | |/ / |/| | | |||||
| * | | am: release strbuf after use in split_mail_mbox() | René Scharfe | 2017-12-07 | 1 | -3/+7 |
* | | | Merge branch 'bc/hash-algo' | Junio C Hamano | 2017-12-13 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Switch empty tree and blob lookups to use hash abstraction | brian m. carlson | 2017-11-13 | 1 | -1/+1 |
* | | | | Merge branch 'mh/tidy-ref-update-flags' | Junio C Hamano | 2017-11-15 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | refs: rename constant `REF_NODEREF` to `REF_NO_DEREF` | Michael Haggerty | 2017-11-06 | 1 | -1/+1 |
* | | | | Merge branch 'bw/diff-opt-impl-to-bitfields' | Junio C Hamano | 2017-11-09 | 1 | -5/+5 |
|\ \ \ \ | |||||
| * | | | | diff: make struct diff_flags members lowercase | Brandon Williams | 2017-11-01 | 1 | -5/+5 |
| * | | | | diff: remove DIFF_OPT_SET macro | Brandon Williams | 2017-11-01 | 1 | -4/+4 |
| * | | | | diff: remove DIFF_OPT_TST macro | Brandon Williams | 2017-11-01 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-11-06 | 1 | -8/+8 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | refs: convert resolve_refdup and refs_resolve_refdup to struct object_id | brian m. carlson | 2017-10-16 | 1 | -1/+1 |
| * | | | refs: convert update_ref and refs_update_ref to use struct object_id | brian m. carlson | 2017-10-16 | 1 | -7/+7 |
| |/ / | |||||
* | | | apply: move lockfile into `apply_state` | Martin Ågren | 2017-10-06 | 1 | -2/+1 |
* | | | treewide: prefer lockfiles on the stack | Martin Ågren | 2017-10-06 | 1 | -13/+11 |
|/ / | |||||
* | | am: release strbuf after use in safe_to_abort() | Rene Scharfe | 2017-09-07 | 1 | -0/+1 |
* | | am: release strbuf on error return in hg_patch_to_mail() | Rene Scharfe | 2017-09-07 | 1 | -10/+19 |
* | | am: release strbufs after use in detect_patch_format() | Rene Scharfe | 2017-09-07 | 1 | -2/+2 |
* | | pack: move pack-closing functions | Jonathan Tan | 2017-08-24 | 1 | -0/+1 |
* | | Merge branch 'pw/am-signoff' | Junio C Hamano | 2017-08-22 | 1 | -25/+1 |
|\ \ | |||||
| * | | am: fix signoff when other trailers are present | Phillip Wood | 2017-08-08 | 1 | -25/+1 |
| * | | Merge branch 'jk/unbreak-am-h' into maint | Junio C Hamano | 2017-06-05 | 1 | -0/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'rs/checkout-am-fix-unborn' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'js/plug-leaks' into maint | Junio C Hamano | 2017-06-04 | 1 | -9/+6 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/am-leakfix' into maint | Junio C Hamano | 2017-06-04 | 1 | -20/+14 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ja/do-not-ask-needless-questions' into maint | Junio C Hamano | 2017-06-04 | 1 | -2/+3 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'pw/sequence-rerere-autoupdate' | Junio C Hamano | 2017-08-22 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ |