Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'ew/empty-merge-with-dirty-index' | Junio C Hamano | 2018-01-05 |
|\ | |||
| * | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with... | Junio C Hamano | 2017-12-22 |
| |\ | |||
| | * | move index_has_changes() from builtin/am.c to merge.c for reuse | Elijah Newren | 2017-12-22 |
* | | | Merge branch 'rs/am-builtin-leakfix' | Junio C Hamano | 2017-12-27 |
|\ \ \ | |/ / |/| | | |||
| * | | am: release strbuf after use in split_mail_mbox() | René Scharfe | 2017-12-07 |
* | | | Merge branch 'bc/hash-algo' | Junio C Hamano | 2017-12-13 |
|\ \ \ | |||
| * | | | Switch empty tree and blob lookups to use hash abstraction | brian m. carlson | 2017-11-13 |
* | | | | Merge branch 'mh/tidy-ref-update-flags' | Junio C Hamano | 2017-11-15 |
|\ \ \ \ | |/ / / |/| | | | |||
| * | | | refs: rename constant `REF_NODEREF` to `REF_NO_DEREF` | Michael Haggerty | 2017-11-06 |
* | | | | Merge branch 'bw/diff-opt-impl-to-bitfields' | Junio C Hamano | 2017-11-09 |
|\ \ \ \ | |||
| * | | | | diff: make struct diff_flags members lowercase | Brandon Williams | 2017-11-01 |
| * | | | | diff: remove DIFF_OPT_SET macro | Brandon Williams | 2017-11-01 |
| * | | | | diff: remove DIFF_OPT_TST macro | Brandon Williams | 2017-11-01 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-11-06 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | refs: convert resolve_refdup and refs_resolve_refdup to struct object_id | brian m. carlson | 2017-10-16 |
| * | | | refs: convert update_ref and refs_update_ref to use struct object_id | brian m. carlson | 2017-10-16 |
| |/ / | |||
* | | | apply: move lockfile into `apply_state` | Martin Ågren | 2017-10-06 |
* | | | treewide: prefer lockfiles on the stack | Martin Ågren | 2017-10-06 |
|/ / | |||
* | | am: release strbuf after use in safe_to_abort() | Rene Scharfe | 2017-09-07 |
* | | am: release strbuf on error return in hg_patch_to_mail() | Rene Scharfe | 2017-09-07 |
* | | am: release strbufs after use in detect_patch_format() | Rene Scharfe | 2017-09-07 |
* | | pack: move pack-closing functions | Jonathan Tan | 2017-08-23 |
* | | Merge branch 'pw/am-signoff' | Junio C Hamano | 2017-08-22 |
|\ \ | |||
| * | | am: fix signoff when other trailers are present | Phillip Wood | 2017-08-08 |
| * | | Merge branch 'jk/unbreak-am-h' into maint | Junio C Hamano | 2017-06-05 |
| |\ \ | |||
| * \ \ | Merge branch 'rs/checkout-am-fix-unborn' into maint | Junio C Hamano | 2017-06-05 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'js/plug-leaks' into maint | Junio C Hamano | 2017-06-04 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'jk/am-leakfix' into maint | Junio C Hamano | 2017-06-04 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'ja/do-not-ask-needless-questions' into maint | Junio C Hamano | 2017-06-04 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge branch 'pw/sequence-rerere-autoupdate' | Junio C Hamano | 2017-08-22 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | am: remember --rerere-autoupdate setting | Phillip Wood | 2017-08-02 |
* | | | | | | | | | sha1_name: convert get_sha1* to get_oid* | brian m. carlson | 2017-07-17 |
|/ / / / / / / / | |||
* | | | | | | | | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | *.[ch] refactoring: make use of the FREE_AND_NULL() macro | Ævar Arnfjörð Bjarmason | 2017-06-16 |
| * | | | | | | | | coccinelle: make use of the "type" FREE_AND_NULL() rule | Ævar Arnfjörð Bjarmason | 2017-06-16 |
* | | | | | | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'bw/object-id' | Junio C Hamano | 2017-06-19 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||
| * | | | | | | | | builtin/notes: convert to struct object_id | brian m. carlson | 2017-06-02 |
* | | | | | | | | | Merge branch 'nd/fopen-errors' | Junio C Hamano | 2017-06-13 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | use xfopen() in more places | Nguyễn Thái Ngọc Duy | 2017-05-26 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jk/unbreak-am-h' | Junio C Hamano | 2017-06-04 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||
| * | | | | | | | am: handle "-h" argument earlier | Jeff King | 2017-05-30 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'ja/do-not-ask-needless-questions' | Junio C Hamano | 2017-05-29 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| * | | | | | | usability: don't ask questions if no reply is required | Jean-Noel Avila | 2017-05-12 |
* | | | | | | | Merge branch 'js/plug-leaks' | Junio C Hamano | 2017-05-29 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||
| * | | | | | | get_mail_commit_oid(): avoid resource leak | Johannes Schindelin | 2017-05-08 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-05-29 |
|\ \ \ \ \ \ | |||
| * | | | | | | tree: convert parse_tree_indirect to struct object_id | brian m. carlson | 2017-05-08 |
| * | | | | | | diff-lib: convert do_diff_cache to struct object_id | brian m. carlson | 2017-05-08 |