aboutsummaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAge
* Merge branch 'pw/am-signoff'Junio C Hamano2017-08-22
|\
| * am: fix signoff when other trailers are presentPhillip Wood2017-08-08
| * Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano2017-06-05
| |\
| * \ Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano2017-06-05
| |\ \
| * \ \ Merge branch 'js/plug-leaks' into maintJunio C Hamano2017-06-04
| |\ \ \
| * \ \ \ Merge branch 'jk/am-leakfix' into maintJunio C Hamano2017-06-04
| |\ \ \ \
| * \ \ \ \ Merge branch 'ja/do-not-ask-needless-questions' into maintJunio C Hamano2017-06-04
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano2017-08-22
|\ \ \ \ \ \ \
| * | | | | | | am: remember --rerere-autoupdate settingPhillip Wood2017-08-02
* | | | | | | | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-17
|/ / / / / / /
* | | | | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-24
|\ \ \ \ \ \ \
| * | | | | | | *.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason2017-06-16
| * | | | | | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-16
* | | | | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | config: don't include config.h by defaultBrandon Williams2017-06-15
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-19
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | builtin/notes: convert to struct object_idbrian m. carlson2017-06-02
* | | | | | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-13
|\ \ \ \ \ \ \ \
| * | | | | | | | use xfopen() in more placesNguyễn Thái Ngọc Duy2017-05-26
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/unbreak-am-h'Junio C Hamano2017-06-04
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | am: handle "-h" argument earlierJeff King2017-05-30
| |/ / / / /
* | | | | | Merge branch 'ja/do-not-ask-needless-questions'Junio C Hamano2017-05-29
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | usability: don't ask questions if no reply is requiredJean-Noel Avila2017-05-12
* | | | | | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-29
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | get_mail_commit_oid(): avoid resource leakJohannes Schindelin2017-05-08
| | |/ / / | |/| | |
* | | | | Merge branch 'bc/object-id'Junio C Hamano2017-05-29
|\ \ \ \ \
| * | | | | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-08
| * | | | | diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-08
| * | | | | revision: rename add_pending_sha1 to add_pending_oidbrian m. carlson2017-05-08
| * | | | | Convert lookup_tree to struct object_idbrian m. carlson2017-05-08
| * | | | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-08
| |/ / / /
* | | | | Merge branch 'rs/checkout-am-fix-unborn'Junio C Hamano2017-05-23
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | am: check return value of resolve_refdup before using hashRené Scharfe2017-05-08
| | |/ / | |/| |
* | | | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-16
|\ \ \ \
| * | | | timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-27
| * | | | parse_timestamp(): specify explicitly where we parse timestampsJohannes Schindelin2017-04-23
* | | | | Merge branch 'jk/am-leakfix'Junio C Hamano2017-05-16
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | am: shorten ident_split variable name in get_commit_info()Jeff King2017-04-27
| * | | am: simplify allocations in get_commit_info()Jeff King2017-04-27
| * | | am: fix commit buffer leak in get_commit_info()Jeff King2017-04-27
* | | | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-26
|\ \ \ \
| * | | | am: drop "dir" parameter from am_state_initJeff King2017-04-20
| | |_|/ | |/| |
* | | | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-26
|\ \ \ \
| * | | | builtin/am: fold am_signoff() into am_append_signoff()Giuseppe Bilotta2017-04-16
| * | | | builtin/am: honor --signoff also when --rebasingGiuseppe Bilotta2017-04-16
| | |/ / | |/| |
* | | | Merge branch 'rs/misc-cppcheck-fixes'Junio C Hamano2017-04-23
|\ \ \ \ | |_|_|/ |/| | |
| * | | am: close stream on error, but not stdinRené Scharfe2017-04-16
| | |/ | |/|
* | | delete_ref: accept a reflog message argumentKyle Meyer2017-02-20
|/ /
* | Merge branch 'sb/sequencer-abort-safety'Junio C Hamano2016-12-21
|\ \ | |/
| * am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer2016-12-08