summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2018-11-18Merge branch 'js/rebase-r-and-merge-head'Junio C Hamano-4/+6
2018-11-13Merge branch 'bp/refresh-index-using-preload'Junio C Hamano-1/+1
2018-11-13Merge branch 'ag/rebase-i-in-c'Junio C Hamano-1/+1
2018-11-13Merge branch 'pw/am-rebase-read-author-script'Junio C Hamano-71/+121
2018-11-13Merge branch 'ma/sequencer-do-reset-saner-loop-termination'Junio C Hamano-2/+5
2018-11-13rebase -i: include MERGE_HEAD into files to clean upJohannes Schindelin-0/+2
2018-11-13rebase -r: do not write MERGE_HEAD unless neededJohannes Schindelin-4/+4
2018-11-06refresh_index: remove unnecessary calls to preload_index()Ben Peart-1/+1
2018-11-05sequencer.c: remove a stray semicolonNguyễn Thái Ngọc Duy-1/+1
2018-11-02Merge branch 'js/rebase-i-shortopt'Junio C Hamano-1/+2
2018-11-02Merge branch 'js/rebase-i-break'Junio C Hamano-1/+24
2018-11-02Merge branch 'cb/printf-empty-format'Junio C Hamano-1/+1
2018-11-02Merge branch 'ag/rebase-i-in-c'Junio C Hamano-59/+261
2018-11-01sequencer: use read_author_script()Phillip Wood-76/+21
2018-11-01add read_author_script() to libgitPhillip Wood-0/+105
2018-10-31sequencer: break out of loop explicitlyMartin Ågren-2/+5
2018-10-27sequencer: cleanup for gcc warning in non developer modeCarlo Marcelo Arenas Belón-1/+1
2018-10-26rebase -i: recognize short commands without argumentsJohannes Sixt-1/+2
2018-10-19Merge branch 'nd/status-refresh-progress'Junio C Hamano-1/+1
2018-10-19Merge branch 'nd/the-index'Junio C Hamano-9/+9
2018-10-16Merge branch 'rs/sequencer-oidset-insert-avoids-dups'Junio C Hamano-3/+1
2018-10-12rebase -i: introduce the 'break' commandJohannes Schindelin-1/+23
2018-10-03sequencer: use return value of oidset_insert()René Scharfe-3/+1
2018-09-24Merge branch 'en/sequencer-empty-edit-result-aborts'Junio C Hamano-2/+2
2018-09-24Merge branch 'js/rebase-i-autosquash-fix'Junio C Hamano-3/+14
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-4/+4
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-2/+2
2018-09-21merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-3/+3
2018-09-17Merge branch 'jk/cocci'Junio C Hamano-20/+20
2018-09-17Merge branch 'jk/trailer-fixes'Junio C Hamano-4/+7
2018-09-17Merge branch 'ds/reachable'Junio C Hamano-0/+1
2018-09-17status: show progress bar if refreshing the index takes too longNguyễn Thái Ngọc Duy-1/+1
2018-09-13sequencer: fix --allow-empty-message behavior, make it smarterElijah Newren-2/+2
2018-09-04Merge branch 'pw/rebase-i-author-script-fix'Junio C Hamano-9/+38
2018-09-04rebase -i: be careful to wrap up fixup/squash chainsJohannes Schindelin-3/+14
2018-08-29rebase -i: rewrite write_basic_state() in CAlban Gruin-11/+66
2018-08-29rebase -i: remove unused modes and functionsAlban Gruin-4/+4
2018-08-29rebase -i: rewrite complete_action() in CAlban Gruin-0/+104
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King-4/+4
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King-16/+16
2018-08-29coccinelle: use <...> for function exclusionJeff King-1/+1
2018-08-23i18n: fix mistakes in translated stringsJean-Noël Avila-1/+1
2018-08-23append_signoff: use size_t for string offsetsJeff King-2/+2
2018-08-23sequencer: ignore "---" divider when parsing trailersJeff King-0/+2
2018-08-23trailer: pass process_trailer_opts to trailer_info_get()Jeff King-1/+2
2018-08-23trailer: use size_t for iterating trailer listJeff King-1/+1
2018-08-20Merge branch 'pw/rebase-i-merge-segv-fix'Junio C Hamano-5/+19
2018-08-20Merge branch 'pw/rebase-i-squash-number-fix'Junio C Hamano-2/+2
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano-2/+2
2018-08-20Merge branch 'js/rebase-merges-exec-fix'Junio C Hamano-11/+31