summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | rebase -i -x: add exec commands via the rebase--helperLiam Beguin2017-12-051-0/+39
| * | | rebase -i: update functions to use a flags parameterLiam Beguin2017-12-051-4/+5
| * | | rebase -i: refactor transform_todo_idsLiam Beguin2017-12-051-41/+28
| * | | rebase -i: set commit to null in exec commandsLiam Beguin2017-12-041-0/+1
* | | | Merge branch 'en/rename-progress'Junio C Hamano2017-12-191-0/+2
|\ \ \ \
| * | | | sequencer: show rename progress during cherry picksElijah Newren2017-11-151-0/+1
| * | | | sequencer: warn when internal merge may be suboptimal due to renameLimitElijah Newren2017-11-141-0/+1
| | |/ / | |/| |
* | | | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-131-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-3/+3
| |/ /
* | | Merge branch 'pw/sequencer-recover-from-unlockable-index'Junio C Hamano2017-11-271-1/+2
|\ \ \
| * | | sequencer: reschedule pick if index can't be lockedpw/sequencer-recover-from-unlockable-indexPhillip Wood2017-11-161-1/+2
| * | | Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano2017-11-151-1/+6
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano2017-11-151-3/+3
|\ \ \ \
| * | | | refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty2017-11-061-3/+3
| * | | | Merge branch 'bc/object-id' into baseMichael Haggerty2017-10-281-7/+7
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge branch 'rs/sequencer-rewrite-file-cleanup'Junio C Hamano2017-11-151-29/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | sequencer.c: check return value of close() in rewrite_file()rs/sequencer-rewrite-file-cleanupSimon Ruderich2017-11-021-1/+2
| * | | | sequencer: use O_TRUNC to truncate filesRené Scharfe2017-11-011-3/+1
| * | | | sequencer: factor out rewrite_file()René Scharfe2017-11-011-29/+17
| |/ / /
View Lorry Controller Status