summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* cherry-pick/revert: remember --rerere-autoupdatePhillip Wood2017-08-021-1/+9
* rebase -i: honor --rerere-autoupdatePhillip Wood2017-08-021-0/+10
* Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano2017-06-301-5/+6
|\
| * sequencer: print autostash messages to stderrJohannes Schindelin2017-06-191-5/+6
* | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-2/+1
|\ \
| * | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-2/+1
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-2/+2
* | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-4/+4
|\ \ \ \
| * | | | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-261-4/+4
| | |/ / | |/| |
* | | | Merge branch 'ab/c-translators-comment-style'Junio C Hamano2017-06-041-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | C style: use standard style for "TRANSLATORS" commentsab/c-translators-comment-styleÆvar Arnfjörð Bjarmason2017-05-311-1/+2
| |/ /
* | | Merge branch 'pw/rebase-i-regression-fix'Junio C Hamano2017-05-291-1/+4
|\ \ \ | | |/ | |/|
| * | rebase -i: add missing newline to end of messagepw/rebase-i-regression-fixPhillip Wood2017-05-201-1/+1
| * | rebase -i: silence stash applyPhillip Wood2017-05-201-0/+2
| * | rebase -i: fix reflog messagePhillip Wood2017-05-201-0/+1
* | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-29/+30
|\ \ \
| * | | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | sequencer: convert do_recursive_merge to struct object_idbrian m. carlson2017-05-081-3/+3
| * | | merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | sequencer: convert fast_forward_to to struct object_idbrian m. carlson2017-05-081-11/+11
| * | | Convert lookup_tree to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-4/+4
| * | | Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson2017-05-081-10/+10
| * | | sequencer: convert some functions to struct object_idbrian m. carlson2017-05-081-6/+6
| * | | Convert struct cache_tree to use struct object_idbrian m. carlson2017-05-021-1/+2
| | |/ | |/|
* | | Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano2017-05-161-7/+4
|\ \ \ | |/ / |/| |
| * | sequencer: add newline before adding footersjt/use-trailer-api-in-commandsJonathan Tan2017-04-261-7/+4
* | | Merge branch 'sh/rebase-i-reread-todo-after-exec'Junio C Hamano2017-05-011-0/+22
|\ \ \
| * | | rebase -i: reread the todo list if `exec` touched itsh/rebase-i-reread-todo-after-execStephen Hicks2017-04-271-0/+22
* | | | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-261-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | use git_path_* helper functionsJeff King2017-04-201-6/+6
* | | | Merge branch 'js/rebase-i-reword-to-run-hooks'Junio C Hamano2017-03-301-23/+31
|\ \ \ \ | |_|_|/ |/| | |
| * | | sequencer: allow the commit-msg hooks to run during a `reword`js/rebase-i-reword-to-run-hooksJohannes Schindelin2017-03-271-2/+6
| * | | sequencer: make commit options more extensibleJohannes Schindelin2017-03-271-22/+26
* | | | sequencer: fix missing newlinejs/rebase-helperBrandon Williams2017-03-231-1/+1
|/ / /
* | | sequencer: drop "warning:" when stopping for editJeff King2017-03-171-1/+2
|/ /
* | sequencer (rebase -i): write out the final messagejs/sequencer-i-countdown-3Johannes Schindelin2017-01-171-0/+3
* | sequencer (rebase -i): write the progress into filesJohannes Schindelin2017-01-171-3/+27
* | sequencer (rebase -i): show the progressJohannes Schindelin2017-01-171-0/+32
* | sequencer (rebase -i): suggest --edit-todo upon unknown commandJohannes Schindelin2017-01-171-1/+5
* | sequencer (rebase -i): show only failed cherry-picks' outputJohannes Schindelin2017-01-171-0/+4
* | sequencer (rebase -i): show only failed `git commit`'s outputJohannes Schindelin2017-01-171-0/+18
* | sequencer: use run_command() directlyJohannes Schindelin2017-01-171-20/+16
* | sequencer: update reading author-scriptJohannes Schindelin2017-01-171-22/+12
* | sequencer (rebase -i): differentiate between comments and 'noop'Johannes Schindelin2017-01-091-6/+9
* | sequencer (rebase -i): implement the 'drop' commandJohannes Schindelin2017-01-091-3/+5
* | sequencer (rebase -i): allow rescheduling commandsJohannes Schindelin2017-01-091-0/+6
View Lorry Controller Status