summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* rebase-helper --make-script: introduce a flag to rebase mergesJohannes Schindelin2018-04-261-1/+345
* sequencer: fast-forward `merge` commands, if possibleJohannes Schindelin2018-04-261-1/+32
* sequencer: introduce the `merge` commandJohannes Schindelin2018-04-261-0/+200
* sequencer: introduce new commands to reset the revisionJohannes Schindelin2018-04-261-7/+206
* sequencer: offer helpful advice when a command was rescheduledJohannes Schindelin2018-04-261-0/+16
* sequencer: refactor how original todo list lines are accessedJohannes Schindelin2018-04-261-24/+36
* sequencer: make rearrange_squash() a bit more obviousJohannes Schindelin2018-04-261-1/+1
* sequencer: avoid using errno clobbered by rollback_lock_file()Johannes Schindelin2018-04-261-4/+6
* Merge branch 'sb/filenames-with-dashes'Junio C Hamano2018-04-251-1/+1
|\
| * exec_cmd: rename to use dash in file nameStefan Beller2018-04-111-1/+1
* | Merge branch 'pw/rebase-signoff'Junio C Hamano2018-04-251-1/+7
|\ \
| * | rebase: extend --signoff supportPhillip Wood2018-03-291-1/+7
| * | Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoffJunio C Hamano2018-03-291-2/+6
| |\ \
* | \ \ Merge branch 'pw/rebase-keep-empty-fixes'Junio C Hamano2018-04-251-2/+6
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | rebase -i --keep-empty: don't prune empty commitsPhillip Wood2018-03-291-2/+6
* | | Merge branch 'bc/object-id'Junio C Hamano2018-04-101-4/+5
|\ \ \
| * | | sha1_file: convert sha1_object_info* to object_idbrian m. carlson2018-03-141-1/+2
| * | | Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-141-1/+1
| * | | cache-tree: convert write_*_as_tree to object_idbrian m. carlson2018-03-141-2/+2
* | | | Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano2018-03-211-6/+5
|\ \ \ \
| * | | | write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-indexMartin Ågren2018-03-011-6/+5
* | | | | Merge branch 'ma/roll-back-lockfiles'Junio C Hamano2018-03-141-18/+14
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | sequencer: do not roll back lockfile unnecessarilyma/roll-back-lockfilesMartin Ågren2018-02-281-12/+6
| * | | sequencer: always roll back lock in `do_recursive_merge()`Martin Ågren2018-02-271-1/+3
| * | | sequencer: make lockfiles non-staticMartin Ågren2018-02-271-5/+5
* | | | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-1/+1
|\ \ \ \
| * | | | object: rename function 'typename' to 'type_name'Brandon Williams2018-02-141-1/+1
| | |/ / | |/| |
* | | | Merge branch 'rs/strbuf-read-file-or-whine'Junio C Hamano2018-03-061-46/+28
|\ \ \ \
| * | | | sequencer: factor out strbuf_read_file_or_whine()rs/strbuf-read-file-or-whineRené Scharfe2018-02-221-46/+28
* | | | | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-061-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patchNguyễn Thái Ngọc Duy2018-02-121-0/+4
| | |/ / | |/| |
* | | | Merge branch 'po/object-id'Junio C Hamano2018-02-151-2/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
* | | Merge branch 'pw/sequencer-in-process-commit'Junio C Hamano2018-02-131-8/+530
|\ \ \ | |/ / |/| |
| * | sequencer: run 'prepare-commit-msg' hookpw/sequencer-in-process-commitPhillip Wood2018-01-241-13/+56
| * | sequencer: assign only free()able strings to gpg_signJohannes Schindelin2017-12-221-1/+1
| * | sequencer: improve config handlingPhillip Wood2017-12-131-39/+48
| * | sequencer: try to commit without forking 'git commit'Phillip Wood2017-11-241-2/+176
| * | sequencer: load commit related configPhillip Wood2017-11-241-0/+34
| * | sequencer: simplify adding Signed-off-by: trailerPhillip Wood2017-11-241-5/+3
| * | commit: move print_commit_summary() to libgitPhillip Wood2017-11-241-0/+119
| * | commit: move post-rewrite code to libgitPhillip Wood2017-11-181-0/+47
| * | Add a function to update HEAD after creating a commitPhillip Wood2017-11-181-1/+38
| * | commit: move empty message checks to libgitPhillip Wood2017-11-111-0/+61
* | | sequencer: do not invent whitespace when transforming OIDsjs/sequencer-cleanupsJohannes Schindelin2017-12-271-1/+4
* | | sequencer: report when noop has an argumentJohannes Schindelin2017-12-271-4/+9
* | | sequencer: remove superfluous conditionalJohannes Schindelin2017-12-271-3/+1
* | | sequencer: strip bogus LF at end of error messagesJohannes Schindelin2017-12-271-4/+4
* | | Merge branch 'lb/rebase-i-short-command-names'Junio C Hamano2017-12-271-43/+83
|\ \ \
| * | | sequencer.c: drop 'const' from function return typelb/rebase-i-short-command-namesJunio C Hamano2017-12-271-1/+1
| * | | rebase -i: learn to abbreviate command namesLiam Beguin2017-12-051-2/+14
View Lorry Controller Status