Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bw/diff-opt-impl-to-bitfields' | Junio C Hamano | 2017-11-09 | 1 | -5/+5 |
|\ | |||||
| * | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfields | 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-23 | 1 | -0/+1 |
* | Merge branch 'pw/am-signoff' | Junio C Hamano | 2017-08-22 | 1 | -25/+1 |
|\ | |||||
| * | am: fix signoff when other trailers are presentpw/am-signoff | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | am: remember --rerere-autoupdate setting | Phillip Wood | 2017-08-02 | 1 | -0/+12 |
* | | | | | | | | sha1_name: convert get_sha1* to get_oid* | brian m. carlson | 2017-07-17 | 1 | -3/+3 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | 1 | -13/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | *.[ch] refactoring: make use of the FREE_AND_NULL() macro | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -11/+4 |
| * | | | | | | | coccinelle: make use of the "type" FREE_AND_NULL() rule | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -2/+1 |
* | | | | | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'bw/object-id' | Junio C Hamano | 2017-06-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | builtin/notes: convert to struct object_id | brian m. carlson | 2017-06-02 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'nd/fopen-errors' | Junio C Hamano | 2017-06-13 | 1 | -6/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | use xfopen() in more places | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -6/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/unbreak-am-h' | Junio C Hamano | 2017-06-04 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | am: handle "-h" argument earlierjk/unbreak-am-h | Jeff King | 2017-05-30 | 1 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ja/do-not-ask-needless-questions' | Junio C Hamano | 2017-05-29 | 1 | -2/+3 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | usability: don't ask questions if no reply is required | Jean-Noel Avila | 2017-05-12 | 1 | -2/+3 |
* | | | | | | Merge branch 'js/plug-leaks' | Junio C Hamano | 2017-05-29 | 1 | -9/+6 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | get_mail_commit_oid(): avoid resource leak | Johannes Schindelin | 2017-05-08 | 1 | -9/+6 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-05-29 | 1 | -9/+9 |
|\ \ \ \ \ | |||||
| * | | | | | tree: convert parse_tree_indirect to struct object_id | brian m. carlson | 2017-05-08 | 1 | -3/+3 |
| * | | | | | diff-lib: convert do_diff_cache to struct object_id | brian m. carlson | 2017-05-08 | 1 | -1/+1 |
| * | | | | | revision: rename add_pending_sha1 to add_pending_oid | brian m. carlson | 2017-05-08 | 1 | -1/+1 |
| * | | | | | Convert lookup_tree to struct object_id | brian m. carlson | 2017-05-08 | 1 | -2/+2 |
| * | | | | | Convert lookup_commit* to struct object_id | brian m. carlson | 2017-05-08 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'rs/checkout-am-fix-unborn' | Junio C Hamano | 2017-05-23 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | am: check return value of resolve_refdup before using hashrs/checkout-am-fix-unborn | René Scharfe | 2017-05-08 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'js/larger-timestamps' | Junio C Hamano | 2017-05-16 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | timestamp_t: a new data type for timestamps | Johannes Schindelin | 2017-04-27 | 1 | -1/+1 |
| * | | | | parse_timestamp(): specify explicitly where we parse timestamps | Johannes Schindelin | 2017-04-23 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/am-leakfix' | Junio C Hamano | 2017-05-16 | 1 | -20/+14 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | |