Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 |
| * | | | | | revision: rename add_pending_sha1 to add_pending_oid | brian m. carlson | 2017-05-08 |
| * | | | | | Convert lookup_tree to struct object_id | brian m. carlson | 2017-05-08 |
| * | | | | | Convert lookup_commit* to struct object_id | brian m. carlson | 2017-05-08 |
| |/ / / / | |||
* | | | | | Merge branch 'rs/checkout-am-fix-unborn' | Junio C Hamano | 2017-05-23 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| * | | | | am: check return value of resolve_refdup before using hash | René Scharfe | 2017-05-08 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'js/larger-timestamps' | Junio C Hamano | 2017-05-16 |
|\ \ \ \ | |||
| * | | | | timestamp_t: a new data type for timestamps | Johannes Schindelin | 2017-04-27 |
| * | | | | parse_timestamp(): specify explicitly where we parse timestamps | Johannes Schindelin | 2017-04-23 |
* | | | | | Merge branch 'jk/am-leakfix' | Junio C Hamano | 2017-05-16 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||
| * | | | am: shorten ident_split variable name in get_commit_info() | Jeff King | 2017-04-27 |
| * | | | am: simplify allocations in get_commit_info() | Jeff King | 2017-04-27 |
| * | | | am: fix commit buffer leak in get_commit_info() | Jeff King | 2017-04-27 |
* | | | | Merge branch 'jk/war-on-git-path' | Junio C Hamano | 2017-04-26 |
|\ \ \ \ | |||
| * | | | | am: drop "dir" parameter from am_state_init | Jeff King | 2017-04-20 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'gb/rebase-signoff' | Junio C Hamano | 2017-04-26 |
|\ \ \ \ | |||
| * | | | | builtin/am: fold am_signoff() into am_append_signoff() | Giuseppe Bilotta | 2017-04-16 |
| * | | | | builtin/am: honor --signoff also when --rebasing | Giuseppe Bilotta | 2017-04-16 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'rs/misc-cppcheck-fixes' | Junio C Hamano | 2017-04-23 |
|\ \ \ \ | |_|_|/ |/| | | | |||
| * | | | am: close stream on error, but not stdin | René Scharfe | 2017-04-16 |
| | |/ | |/| | |||
* | | | delete_ref: accept a reflog message argument | Kyle Meyer | 2017-02-20 |
|/ / | |||
* | | Merge branch 'sb/sequencer-abort-safety' | Junio C Hamano | 2016-12-21 |
|\ \ | |/ | |||
| * | am: change safe_to_abort()'s not rewinding error into a warning | Stephan Beyer | 2016-12-08 |