summaryrefslogtreecommitdiff
path: root/sequencer.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/am-rebase-read-author-script'Junio C Hamano2018-11-131-0/+3
|\
| * add read_author_script() to libgitPhillip Wood2018-11-011-0/+3
* | Merge branch 'ag/rebase-i-in-c'Junio C Hamano2018-11-021-1/+21
|\ \ | |/ |/|
| * rebase -i: rewrite write_basic_state() in CAlban Gruin2018-08-291-0/+4
| * rebase -i: remove unused modes and functionsAlban Gruin2018-08-291-4/+0
| * rebase -i: rewrite complete_action() in CAlban Gruin2018-08-291-0/+4
| * sequencer: change the way skip_unnecessary_picks() returns its resultAlban Gruin2018-08-101-1/+1
| * rebase -i: rewrite checkout_onto() in CAlban Gruin2018-08-101-0/+3
| * rebase -i: rewrite setup_reflog_action() in CAlban Gruin2018-08-101-0/+2
| * sequencer: make three functions and an enum from sequencer.c publicAlban Gruin2018-08-101-0/+11
* | Merge branch 'jk/trailer-fixes'Junio C Hamano2018-09-171-1/+8
|\ \
| * | append_signoff: use size_t for string offsetsJeff King2018-08-231-1/+8
| |/
* | Add missing includes and forward declarationsElijah Newren2018-08-151-0/+5
|/
* Merge branch 'js/sequencer-and-root-commits'Junio C Hamano2018-05-301-0/+4
|\
| * sequencer: learn about the special "fake root commit" handlingJohannes Schindelin2018-05-061-0/+4
* | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-05-231-0/+7
|\ \ | |/
| * rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin2018-04-261-0/+6
| * rebase-helper --make-script: introduce a flag to rebase mergesJohannes Schindelin2018-04-261-0/+1
* | rebase -i: Handle "combination of <n> commits" with GETTEXT_POISONJohannes Schindelin2018-05-021-1/+5
|/
* Merge branch 'pw/sequencer-in-process-commit'Junio C Hamano2018-02-131-0/+25
|\
| * sequencer: run 'prepare-commit-msg' hookpw/sequencer-in-process-commitPhillip Wood2018-01-241-0/+1
| * sequencer: improve config handlingPhillip Wood2017-12-131-9/+10
| * sequencer: load commit related configPhillip Wood2017-11-241-0/+1
| * commit: move print_commit_summary() to libgitPhillip Wood2017-11-241-0/+5
| * commit: move post-rewrite code to libgitPhillip Wood2017-11-181-0/+2
| * Add a function to update HEAD after creating a commitPhillip Wood2017-11-181-0/+4
| * commit: move empty message checks to libgitPhillip Wood2017-11-111-0/+11
* | rebase -i: learn to abbreviate command namesLiam Beguin2017-12-051-0/+1
* | rebase -i -x: add exec commands via the rebase--helperLiam Beguin2017-12-051-0/+1
* | rebase -i: update functions to use a flags parameterLiam Beguin2017-12-051-3/+5
* | rebase -i: refactor transform_todo_idsLiam Beguin2017-12-051-1/+1
|/
* rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-271-0/+1
* rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin2017-07-271-0/+1
* rebase -i: check for missing commits in the rebase--helperJohannes Schindelin2017-07-271-0/+1
* rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin2017-07-271-0/+2
* rebase -i: generate the script via rebase--helperJohannes Schindelin2017-07-271-0/+3
* sequencer (rebase -i): learn about the 'verbose' modeJohannes Schindelin2017-01-091-0/+1
* sequencer: support a new action: 'interactive rebase'Johannes Schindelin2017-01-091-1/+2
* sequencer: get rid of the subcommand fieldJohannes Schindelin2016-10-211-9/+4
* sequencer: plug memory leaks for the option valuesJohannes Schindelin2016-10-211-3/+3
* sequencer: use memoized sequencer directory pathJohannes Schindelin2016-10-171-4/+1
* sequencer: use static initializers for replay_optsJohannes Schindelin2016-10-171-0/+1
* Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-101-0/+1
|\
| * merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano2014-10-241-0/+1
* | cherry-pick, revert: add the --gpg-sign optionNicolas Vigier2014-01-271-0/+2
|/
* sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey2013-02-121-1/+3
* Merge branch 'jc/make-static'Junio C Hamano2012-09-181-3/+0
|\
| * sequencer.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-151-3/+0
* | cherry-pick: don't forget -s on failureMiklos Vajna2012-09-141-0/+4
|/
* cherry-pick: add --allow-empty-message optionChris Webb2012-08-061-0/+1
View Lorry Controller Status