summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/rebase-r-and-merge-head'Junio C Hamano2018-11-181-4/+6
|\
| * rebase -i: include MERGE_HEAD into files to clean upJohannes Schindelin2018-11-131-0/+2
| * rebase -r: do not write MERGE_HEAD unless neededJohannes Schindelin2018-11-131-4/+4
* | Merge branch 'bp/refresh-index-using-preload'Junio C Hamano2018-11-131-1/+1
|\ \
| * | refresh_index: remove unnecessary calls to preload_index()Ben Peart2018-11-061-1/+1
* | | Merge branch 'ag/rebase-i-in-c'Junio C Hamano2018-11-131-1/+1
|\ \ \
| * | | sequencer.c: remove a stray semicolonNguyễn Thái Ngọc Duy2018-11-051-1/+1
* | | | Merge branch 'pw/am-rebase-read-author-script'Junio C Hamano2018-11-131-71/+121
|\ \ \ \
| * | | | sequencer: use read_author_script()Phillip Wood2018-11-011-76/+21
| * | | | add read_author_script() to libgitPhillip Wood2018-11-011-0/+105
* | | | | Merge branch 'ma/sequencer-do-reset-saner-loop-termination'Junio C Hamano2018-11-131-2/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | sequencer: break out of loop explicitlyMartin Ågren2018-10-311-2/+5
* | | | | Merge branch 'js/rebase-i-shortopt'Junio C Hamano2018-11-021-1/+2
|\ \ \ \ \
| * | | | | rebase -i: recognize short commands without argumentsJohannes Sixt2018-10-261-1/+2
* | | | | | Merge branch 'js/rebase-i-break'Junio C Hamano2018-11-021-1/+24
|\ \ \ \ \ \ | |/ / / / /
| * | | | | rebase -i: introduce the 'break' commandJohannes Schindelin2018-10-121-1/+23
| | |_|/ / | |/| | |
* | | | | Merge branch 'cb/printf-empty-format'Junio C Hamano2018-11-021-1/+1
|\ \ \ \ \
| * | | | | sequencer: cleanup for gcc warning in non developer modeCarlo Marcelo Arenas Belón2018-10-271-1/+1
| |/ / / /
* | | | | Merge branch 'ag/rebase-i-in-c'Junio C Hamano2018-11-021-59/+261
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | rebase -i: rewrite write_basic_state() in CAlban Gruin2018-08-291-11/+66
| * | | rebase -i: remove unused modes and functionsAlban Gruin2018-08-291-4/+4
| * | | rebase -i: rewrite complete_action() in CAlban Gruin2018-08-291-0/+104
| * | | sequencer: change the way skip_unnecessary_picks() returns its resultAlban Gruin2018-08-101-7/+6
| * | | rebase -i: rewrite checkout_onto() in CAlban Gruin2018-08-101-0/+19
| * | | rebase -i: rewrite setup_reflog_action() in CAlban Gruin2018-08-101-0/+30
| * | | sequencer: add a new function to silence a command, except if it failsAlban Gruin2018-08-101-26/+25
| * | | sequencer: make three functions and an enum from sequencer.c publicAlban Gruin2018-08-101-15/+11
* | | | Merge branch 'nd/status-refresh-progress'Junio C Hamano2018-10-191-1/+1
|\ \ \ \
| * | | | status: show progress bar if refreshing the index takes too longNguyễn Thái Ngọc Duy2018-09-171-1/+1
| | |/ / | |/| |
* | | | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-9/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-4/+4
| * | | rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+2
| * | | merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+3
| |/ /
* | | Merge branch 'rs/sequencer-oidset-insert-avoids-dups'Junio C Hamano2018-10-161-3/+1
|\ \ \
| * | | sequencer: use return value of oidset_insert()René Scharfe2018-10-031-3/+1
| |/ /
* | | Merge branch 'en/sequencer-empty-edit-result-aborts'Junio C Hamano2018-09-241-2/+2
|\ \ \
| * | | sequencer: fix --allow-empty-message behavior, make it smarterElijah Newren2018-09-131-2/+2
* | | | Merge branch 'js/rebase-i-autosquash-fix'Junio C Hamano2018-09-241-3/+14
|\ \ \ \
| * | | | rebase -i: be careful to wrap up fixup/squash chainsJohannes Schindelin2018-09-041-3/+14
| |/ / /
* | | | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-20/+20
|\ \ \ \
| * | | | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-4/+4
| * | | | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-16/+16
| * | | | coccinelle: use <...> for function exclusionJeff King2018-08-291-1/+1
* | | | | Merge branch 'jk/trailer-fixes'Junio C Hamano2018-09-171-4/+7
|\ \ \ \ \
| * | | | | append_signoff: use size_t for string offsetsJeff King2018-08-231-2/+2
| * | | | | sequencer: ignore "---" divider when parsing trailersJeff King2018-08-231-0/+2
| * | | | | trailer: pass process_trailer_opts to trailer_info_get()Jeff King2018-08-231-1/+2
| * | | | | trailer: use size_t for iterating trailer listJeff King2018-08-231-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'ds/reachable'Junio C Hamano2018-09-171-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | commit.h: remove method declarationsDerrick Stolee2018-07-201-0/+1