summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2017-12-27sequencer: do not invent whitespace when transforming OIDsJohannes Schindelin-1/+4
2017-12-27sequencer: report when noop has an argumentJohannes Schindelin-4/+9
2017-12-27sequencer: remove superfluous conditionalJohannes Schindelin-3/+1
2017-12-27sequencer: strip bogus LF at end of error messagesJohannes Schindelin-4/+4
2017-12-27Merge branch 'lb/rebase-i-short-command-names'Junio C Hamano-43/+83
2017-12-27sequencer.c: drop 'const' from function return typeJunio C Hamano-1/+1
2017-12-19Merge branch 'en/rename-progress'Junio C Hamano-0/+2
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano-3/+3
2017-12-05rebase -i: learn to abbreviate command namesLiam Beguin-2/+14
2017-12-05rebase -i -x: add exec commands via the rebase--helperLiam Beguin-0/+39
2017-12-05rebase -i: update functions to use a flags parameterLiam Beguin-4/+5
2017-12-05rebase -i: refactor transform_todo_idsLiam Beguin-41/+28
2017-12-04rebase -i: set commit to null in exec commandsLiam Beguin-0/+1
2017-11-27Merge branch 'pw/sequencer-recover-from-unlockable-index'Junio C Hamano-1/+2
2017-11-16sequencer: reschedule pick if index can't be lockedPhillip Wood-1/+2
2017-11-15sequencer: show rename progress during cherry picksElijah Newren-0/+1
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano-3/+3
2017-11-15Merge branch 'rs/sequencer-rewrite-file-cleanup'Junio C Hamano-29/+16
2017-11-15Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano-1/+6
2017-11-14sequencer: warn when internal merge may be suboptimal due to renameLimitElijah Newren-0/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson-3/+3
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano-2/+3
2017-11-06Merge branch 'bc/object-id'Junio C Hamano-7/+7
2017-11-06Merge branch 'jk/rebase-i-exec-gitdir-fix'Junio C Hamano-1/+6
2017-11-06Merge branch 'ma/lockfile-fixes'Junio C Hamano-1/+0
2017-11-06refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty-3/+3
2017-11-02sequencer.c: check return value of close() in rewrite_file()Simon Ruderich-1/+2
2017-11-02sequencer: pass absolute GIT_DIR to exec commandsJacob Keller-1/+6
2017-11-01diff: convert flags to be stored in bitfieldsBrandon Williams-2/+3
2017-11-01sequencer: use O_TRUNC to truncate filesRené Scharfe-3/+1
2017-11-01sequencer: factor out rewrite_file()René Scharfe-29/+17
2017-10-28Merge branch 'bc/object-id' into baseMichael Haggerty-7/+7
2017-10-18Merge branch 'js/rebase-i-final'Junio C Hamano-1/+1
2017-10-18sequencer.c: unify an error messageRalf Thielow-1/+1
2017-10-17Merge branch 'js/rebase-i-final'Junio C Hamano-2/+2
2017-10-16refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson-1/+1
2017-10-16refs: convert read_ref and read_ref_full to object_idbrian m. carlson-1/+1
2017-10-16refs: update ref transactions to use struct object_idbrian m. carlson-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson-4/+4
2017-10-16sequencer.c: fix and unify error messages in rearrange_squash()Ralf Thielow-2/+2
2017-10-09Merge branch 'js/rebase-i-final'Junio C Hamano-1/+1
2017-10-09i18n: add a missing space in messageJean-Noel Avila-1/+1
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Martin Ågren-1/+0
2017-10-05Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano-1/+1
2017-10-03Merge branch 'js/rebase-i-final'Junio C Hamano-0/+531
2017-10-02use strbuf_addstr() for adding strings to strbufsRené Scharfe-1/+1
2017-09-07sequencer: release strbuf after use in save_head()Rene Scharfe-1/+4
2017-08-22Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano-1/+19
2017-08-02cherry-pick/revert: remember --rerere-autoupdatePhillip Wood-1/+9
2017-08-02rebase -i: honor --rerere-autoupdatePhillip Wood-0/+10