summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / /
* | | | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-2/+3
|\ \ \ \
| * | | | diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-011-2/+3
| |/ / /
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-11-061-7/+7
|\ \ \ \ | | |/ / | |/| |
| * | | refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson2017-10-161-1/+1
| * | | refs: convert read_ref and read_ref_full to object_idbrian m. carlson2017-10-161-1/+1
| * | | refs: update ref transactions to use struct object_idbrian m. carlson2017-10-161-1/+1
| * | | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-161-4/+4
* | | | Merge branch 'jk/rebase-i-exec-gitdir-fix'Junio C Hamano2017-11-061-1/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | sequencer: pass absolute GIT_DIR to exec commandsjk/rebase-i-exec-gitdir-fixJacob Keller2017-11-021-1/+6
* | | | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-061-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | read-cache: leave lock in right state in `write_locked_index()`Martin Ågren2017-10-071-1/+0
* | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-181-1/+1
|\ \ \ \
| * | | | sequencer.c: unify an error messagejs/rebase-i-finalRalf Thielow2017-10-181-1/+1
* | | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-171-2/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | sequencer.c: fix and unify error messages in rearrange_squash()Ralf Thielow2017-10-161-2/+2
* | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-091-1/+1
|\ \ \ \ | |/ / /
| * | | i18n: add a missing space in messageJean-Noel Avila2017-10-091-1/+1
* | | | Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano2017-10-051-1/+1
|\ \ \ \
| * | | | use strbuf_addstr() for adding strings to strbufsRené Scharfe2017-10-021-1/+1
| | |/ / | |/| |
* | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-031-0/+531
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-271-0/+196
| * | rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin2017-07-271-0/+107
| * | rebase -i: check for missing commits in the rebase--helperJohannes Schindelin2017-07-271-0/+122
| * | rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin2017-07-271-0/+57
| * | rebase -i: generate the script via rebase--helperJohannes Schindelin2017-07-271-0/+49
* | | sequencer: release strbuf after use in save_head()Rene Scharfe2017-09-071-1/+4
* | | Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano2017-08-221-1/+19
|\ \ \
| * | | cherry-pick/revert: remember --rerere-autoupdatePhillip Wood2017-08-021-1/+9
View Lorry Controller Status