summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2017-12-27Merge branch 'lb/rebase-i-short-command-names'Libravatar Junio C Hamano1-43/+83
2017-12-27sequencer.c: drop 'const' from function return typeLibravatar Junio C Hamano1-1/+1
2017-12-19Merge branch 'en/rename-progress'Libravatar Junio C Hamano1-0/+2
2017-12-13Merge branch 'bc/hash-algo'Libravatar Junio C Hamano1-3/+3
2017-12-05rebase -i: learn to abbreviate command namesLibravatar Liam Beguin1-2/+14
2017-12-05rebase -i -x: add exec commands via the rebase--helperLibravatar Liam Beguin1-0/+39
2017-12-05rebase -i: update functions to use a flags parameterLibravatar Liam Beguin1-4/+5
2017-12-05rebase -i: refactor transform_todo_idsLibravatar Liam Beguin1-41/+28
2017-12-04rebase -i: set commit to null in exec commandsLibravatar Liam Beguin1-0/+1
2017-11-27Merge branch 'pw/sequencer-recover-from-unlockable-index'Libravatar Junio C Hamano1-1/+2
2017-11-16sequencer: reschedule pick if index can't be lockedLibravatar Phillip Wood1-1/+2
2017-11-15sequencer: show rename progress during cherry picksLibravatar Elijah Newren1-0/+1
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Libravatar Junio C Hamano1-3/+3
2017-11-15Merge branch 'rs/sequencer-rewrite-file-cleanup'Libravatar Junio C Hamano1-29/+16
2017-11-15Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintLibravatar Junio C Hamano1-1/+6
2017-11-14sequencer: warn when internal merge may be suboptimal due to renameLimitLibravatar Elijah Newren1-0/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionLibravatar brian m. carlson1-3/+3
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-2/+3
2017-11-06Merge branch 'bc/object-id'Libravatar Junio C Hamano1-7/+7
2017-11-06Merge branch 'jk/rebase-i-exec-gitdir-fix'Libravatar Junio C Hamano1-1/+6
2017-11-06Merge branch 'ma/lockfile-fixes'Libravatar Junio C Hamano1-1/+0
2017-11-06refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Libravatar Michael Haggerty1-3/+3
2017-11-02sequencer.c: check return value of close() in rewrite_file()Libravatar Simon Ruderich1-1/+2
2017-11-02sequencer: pass absolute GIT_DIR to exec commandsLibravatar Jacob Keller1-1/+6
2017-11-01diff: convert flags to be stored in bitfieldsLibravatar Brandon Williams1-2/+3
2017-11-01sequencer: use O_TRUNC to truncate filesLibravatar René Scharfe1-3/+1
2017-11-01sequencer: factor out rewrite_file()Libravatar René Scharfe1-29/+17
2017-10-28Merge branch 'bc/object-id' into baseLibravatar Michael Haggerty1-7/+7
2017-10-18Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano1-1/+1
2017-10-18sequencer.c: unify an error messageLibravatar Ralf Thielow1-1/+1
2017-10-17Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano1-2/+2
2017-10-16refs: convert resolve_ref_unsafe to struct object_idLibravatar brian m. carlson1-1/+1
2017-10-16refs: convert read_ref and read_ref_full to object_idLibravatar brian m. carlson1-1/+1
2017-10-16refs: update ref transactions to use struct object_idLibravatar brian m. carlson1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idLibravatar brian m. carlson1-4/+4
2017-10-16sequencer.c: fix and unify error messages in rearrange_squash()Libravatar Ralf Thielow1-2/+2
2017-10-09Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano1-1/+1
2017-10-09i18n: add a missing space in messageLibravatar Jean-Noel Avila1-1/+1
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Libravatar Martin Ågren1-1/+0
2017-10-05Merge branch 'rs/cleanup-strbuf-users'Libravatar Junio C Hamano1-1/+1
2017-10-03Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano1-0/+531
2017-10-02use strbuf_addstr() for adding strings to strbufsLibravatar René Scharfe1-1/+1
2017-09-07sequencer: release strbuf after use in save_head()Libravatar Rene Scharfe1-1/+4
2017-08-22Merge branch 'pw/sequence-rerere-autoupdate'Libravatar Junio C Hamano1-1/+19
2017-08-02cherry-pick/revert: remember --rerere-autoupdateLibravatar Phillip Wood1-1/+9
2017-08-02rebase -i: honor --rerere-autoupdateLibravatar Phillip Wood1-0/+10
2017-07-27rebase -i: rearrange fixup/squash lines using the rebase--helperLibravatar Johannes Schindelin1-0/+196
2017-07-27rebase -i: skip unnecessary picks using the rebase--helperLibravatar Johannes Schindelin1-0/+107
2017-07-27rebase -i: check for missing commits in the rebase--helperLibravatar Johannes Schindelin1-0/+122
2017-07-27rebase -i: also expand/collapse the SHA-1s via the rebase--helperLibravatar Johannes Schindelin1-0/+57