summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2017-11-27Merge branch 'pw/sequencer-recover-from-unlockable-index'Junio C Hamano
2017-11-16sequencer: reschedule pick if index can't be lockedPhillip Wood
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano
2017-11-15Merge branch 'rs/sequencer-rewrite-file-cleanup'Junio C Hamano
2017-11-15Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano
2017-11-06Merge branch 'bc/object-id'Junio C Hamano
2017-11-06Merge branch 'jk/rebase-i-exec-gitdir-fix'Junio C Hamano
2017-11-06Merge branch 'ma/lockfile-fixes'Junio C Hamano
2017-11-06refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty
2017-11-02sequencer.c: check return value of close() in rewrite_file()Simon Ruderich
2017-11-02sequencer: pass absolute GIT_DIR to exec commandsJacob Keller
2017-11-01diff: convert flags to be stored in bitfieldsBrandon Williams
2017-11-01sequencer: use O_TRUNC to truncate filesRené Scharfe
2017-11-01sequencer: factor out rewrite_file()René Scharfe
2017-10-28Merge branch 'bc/object-id' into baseMichael Haggerty
2017-10-18Merge branch 'js/rebase-i-final'Junio C Hamano
2017-10-17sequencer.c: unify an error messageRalf Thielow
2017-10-17Merge branch 'js/rebase-i-final'Junio C Hamano
2017-10-16refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson
2017-10-16refs: convert read_ref and read_ref_full to object_idbrian m. carlson
2017-10-16refs: update ref transactions to use struct object_idbrian m. carlson
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson
2017-10-16sequencer.c: fix and unify error messages in rearrange_squash()Ralf Thielow
2017-10-09Merge branch 'js/rebase-i-final'Junio C Hamano
2017-10-09i18n: add a missing space in messageJean-Noel Avila
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Martin Ågren
2017-10-05Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano
2017-10-03Merge branch 'js/rebase-i-final'Junio C Hamano
2017-10-02use strbuf_addstr() for adding strings to strbufsRené Scharfe
2017-09-06sequencer: release strbuf after use in save_head()Rene Scharfe
2017-08-22Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano
2017-08-02cherry-pick/revert: remember --rerere-autoupdatePhillip Wood
2017-08-02rebase -i: honor --rerere-autoupdatePhillip Wood
2017-07-27rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin
2017-07-27rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin
2017-07-27rebase -i: check for missing commits in the rebase--helperJohannes Schindelin
2017-07-27rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin
2017-07-27rebase -i: generate the script via rebase--helperJohannes Schindelin
2017-07-17sha1_name: convert get_sha1* to get_oid*brian m. carlson
2017-07-17sequencer: convert to struct object_idbrian m. carlson
2017-06-30Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-19Merge branch 'bw/object-id'Junio C Hamano
2017-06-19sequencer: print autostash messages to stderrJohannes Schindelin
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams