Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/rebase-i-shortopt' | Junio C Hamano | 2018-11-02 | 1 | -1/+2 |
|\ | |||||
| * | rebase -i: recognize short commands without arguments | Johannes Sixt | 2018-10-26 | 1 | -1/+2 |
* | | Merge branch 'js/rebase-i-break' | Junio C Hamano | 2018-11-02 | 1 | -1/+24 |
|\| | |||||
| * | rebase -i: introduce the 'break' command | Johannes Schindelin | 2018-10-12 | 1 | -1/+23 |
* | | Merge branch 'cb/printf-empty-format' | Junio C Hamano | 2018-11-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | sequencer: cleanup for gcc warning in non developer mode | Carlo Marcelo Arenas Belón | 2018-10-27 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'ag/rebase-i-in-c' | Junio C Hamano | 2018-11-02 | 1 | -59/+261 |
|\| | |||||
| * | rebase -i: rewrite write_basic_state() in C | Alban Gruin | 2018-08-29 | 1 | -11/+66 |
| * | rebase -i: remove unused modes and functions | Alban Gruin | 2018-08-29 | 1 | -4/+4 |
| * | rebase -i: rewrite complete_action() in C | Alban Gruin | 2018-08-29 | 1 | -0/+104 |
| * | sequencer: change the way skip_unnecessary_picks() returns its result | Alban Gruin | 2018-08-10 | 1 | -7/+6 |
| * | rebase -i: rewrite checkout_onto() in C | Alban Gruin | 2018-08-10 | 1 | -0/+19 |
| * | rebase -i: rewrite setup_reflog_action() in C | Alban Gruin | 2018-08-10 | 1 | -0/+30 |
| * | sequencer: add a new function to silence a command, except if it fails | Alban Gruin | 2018-08-10 | 1 | -26/+25 |
| * | sequencer: make three functions and an enum from sequencer.c public | Alban Gruin | 2018-08-10 | 1 | -15/+11 |
* | | Merge branch 'nd/status-refresh-progress' | Junio C Hamano | 2018-10-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | status: show progress bar if refreshing the index takes too long | Nguyễn Thái Ngọc Duy | 2018-09-17 | 1 | -1/+1 |
* | | | Merge branch 'nd/the-index' | Junio C Hamano | 2018-10-19 | 1 | -9/+9 |
|\ \ \ | |||||
| * | | | revision.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -4/+4 |
| * | | | rerere.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -2/+2 |
| * | | | merge.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -3/+3 |
| |/ / | |||||
* | | | Merge branch 'rs/sequencer-oidset-insert-avoids-dups' | Junio C Hamano | 2018-10-16 | 1 | -3/+1 |
|\ \ \ | |||||
| * | | | sequencer: use return value of oidset_insert() | René Scharfe | 2018-10-04 | 1 | -3/+1 |
| |/ / | |||||
* | | | Merge branch 'en/sequencer-empty-edit-result-aborts' | Junio C Hamano | 2018-09-24 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | sequencer: fix --allow-empty-message behavior, make it smarter | Elijah Newren | 2018-09-13 | 1 | -2/+2 |
* | | | | Merge branch 'js/rebase-i-autosquash-fix' | Junio C Hamano | 2018-09-24 | 1 | -3/+14 |
|\ \ \ \ | |||||
| * | | | | rebase -i: be careful to wrap up fixup/squash chains | Johannes Schindelin | 2018-09-04 | 1 | -3/+14 |
| |/ / / | |||||
* | | | | Merge branch 'jk/cocci' | Junio C Hamano | 2018-09-17 | 1 | -20/+20 |
|\ \ \ \ | |||||
| * | | | | convert "oidcmp() != 0" to "!oideq()" | Jeff King | 2018-08-29 | 1 | -4/+4 |
| * | | | | convert "oidcmp() == 0" to oideq() | Jeff King | 2018-08-29 | 1 | -16/+16 |
| * | | | | coccinelle: use <...> for function exclusion | Jeff King | 2018-08-29 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/trailer-fixes' | Junio C Hamano | 2018-09-17 | 1 | -4/+7 |
|\ \ \ \ \ | |||||
| * | | | | | append_signoff: use size_t for string offsets | Jeff King | 2018-08-23 | 1 | -2/+2 |
| * | | | | | sequencer: ignore "---" divider when parsing trailers | Jeff King | 2018-08-23 | 1 | -0/+2 |
| * | | | | | trailer: pass process_trailer_opts to trailer_info_get() | Jeff King | 2018-08-23 | 1 | -1/+2 |
| * | | | | | trailer: use size_t for iterating trailer list | Jeff King | 2018-08-23 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ds/reachable' | Junio C Hamano | 2018-09-17 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | commit.h: remove method declarations | Derrick Stolee | 2018-07-21 | 1 | -0/+1 |
* | | | | | Merge branch 'pw/rebase-i-author-script-fix' | Junio C Hamano | 2018-09-04 | 1 | -9/+38 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | sequencer: fix quoting in write_author_script | Phillip Wood | 2018-08-07 | 1 | -7/+29 |
| * | | | | sequencer: handle errors from read_author_ident() | Phillip Wood | 2018-08-07 | 1 | -2/+9 |
* | | | | | i18n: fix mistakes in translated strings | Jean-Noël Avila | 2018-08-23 | 1 | -1/+1 |
* | | | | | Merge branch 'pw/rebase-i-merge-segv-fix' | Junio C Hamano | 2018-08-20 | 1 | -5/+19 |
|\ \ \ \ \ | |||||
| * | | | | | rebase -i: fix SIGSEGV when 'merge <branch>' fails | Phillip Wood | 2018-08-16 | 1 | -5/+19 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'pw/rebase-i-squash-number-fix' | Junio C Hamano | 2018-08-20 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | rebase -i: fix numbering in squash message | Phillip Wood | 2018-08-15 | 1 | -2/+2 |
* | | | | | | Merge branch 'nd/no-the-index' | Junio C Hamano | 2018-08-20 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cache-tree: wrap the_index based wrappers with #ifdef | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -2/+2 |
* | | | | | | | Merge branch 'js/rebase-merges-exec-fix' | Junio C Hamano | 2018-08-20 | 1 | -11/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase --exec: make it work with --rebase-merges | Johannes Schindelin | 2018-08-09 | 1 | -11/+31 |
| |/ / / / / / |