summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2017-12-06Merge branch 'pw/sequencer-recover-from-unlockable-index' into maintLibravatar Junio C Hamano1-1/+2
2017-11-21Merge branch 'rs/sequencer-rewrite-file-cleanup' into maintLibravatar Junio C Hamano1-29/+16
2017-11-16sequencer: reschedule pick if index can't be lockedLibravatar Phillip Wood1-1/+2
2017-11-15Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintLibravatar Junio C Hamano1-1/+6
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-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-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-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-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
2017-07-27rebase -i: generate the script via rebase--helperLibravatar Johannes Schindelin1-0/+49
2017-07-17sha1_name: convert get_sha1* to get_oid*Libravatar brian m. carlson1-3/+3
2017-07-17sequencer: convert to struct object_idLibravatar brian m. carlson1-29/+30
2017-06-30Merge branch 'pw/rebase-i-regression-fix-tests'Libravatar Junio C Hamano1-5/+6
2017-06-24Merge branch 'ab/free-and-null'Libravatar Junio C Hamano1-2/+1
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-19Merge branch 'bw/object-id'Libravatar Junio C Hamano1-2/+2
2017-06-19sequencer: print autostash messages to stderrLibravatar Johannes Schindelin1-5/+6
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleLibravatar Ævar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Libravatar Junio C Hamano1-4/+4
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idLibravatar Brandon Williams1-2/+2
2017-06-04Merge branch 'ab/c-translators-comment-style'Libravatar Junio C Hamano1-1/+2
2017-05-31C style: use standard style for "TRANSLATORS" commentsLibravatar Ævar Arnfjörð Bjarmason1-1/+2
2017-05-29Merge branch 'pw/rebase-i-regression-fix'Libravatar Junio C Hamano1-1/+4
2017-05-29Merge branch 'bc/object-id'Libravatar Junio C Hamano1-29/+30
2017-05-26wrapper.c: add and use fopen_or_warn()Libravatar Nguyễn Thái Ngọc Duy1-4/+4
2017-05-20rebase -i: add missing newline to end of messageLibravatar Phillip Wood1-1/+1
2017-05-20rebase -i: silence stash applyLibravatar Phillip Wood1-0/+2
2017-05-20rebase -i: fix reflog messageLibravatar Phillip Wood1-0/+1
2017-05-16Merge branch 'jt/use-trailer-api-in-commands'Libravatar Junio C Hamano1-7/+4
2017-05-08tree: convert parse_tree_indirect to struct object_idLibravatar brian m. carlson1-1/+1
2017-05-08sequencer: convert do_recursive_merge to struct object_idLibravatar brian m. carlson1-3/+3
2017-05-08merge: convert checkout_fast_forward to struct object_idLibravatar brian m. carlson1-1/+1
2017-05-08sequencer: convert fast_forward_to to struct object_idLibravatar brian m. carlson1-11/+11