aboutsummaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAge
* Merge branch 'pw/sequencer-recover-from-unlockable-index' into maintJunio C Hamano2017-12-06
|\
| * sequencer: reschedule pick if index can't be lockedPhillip Wood2017-11-16
* | Merge branch 'rs/sequencer-rewrite-file-cleanup' into maintJunio C Hamano2017-11-21
|\ \ | |/ |/|
| * sequencer.c: check return value of close() in rewrite_file()Simon Ruderich2017-11-02
| * sequencer: use O_TRUNC to truncate filesRené Scharfe2017-11-01
| * sequencer: factor out rewrite_file()René Scharfe2017-11-01
* | Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano2017-11-15
|\ \ | |/ |/|
| * sequencer: pass absolute GIT_DIR to exec commandsJacob Keller2017-11-02
* | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-18
|\ \
| * | sequencer.c: unify an error messageRalf Thielow2017-10-18
* | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-17
|\ \ \ | |/ /
| * | sequencer.c: fix and unify error messages in rearrange_squash()Ralf Thielow2017-10-16
* | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-09
|\ \ \ | |/ /
| * | i18n: add a missing space in messageJean-Noel Avila2017-10-09
* | | Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano2017-10-05
|\ \ \
| * | | use strbuf_addstr() for adding strings to strbufsRené Scharfe2017-10-02
* | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-03
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-27
| * | rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin2017-07-27
| * | rebase -i: check for missing commits in the rebase--helperJohannes Schindelin2017-07-27
| * | rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin2017-07-27
| * | rebase -i: generate the script via rebase--helperJohannes Schindelin2017-07-27
* | | sequencer: release strbuf after use in save_head()Rene Scharfe2017-09-07
* | | Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano2017-08-22
|\ \ \
| * | | cherry-pick/revert: remember --rerere-autoupdatePhillip Wood2017-08-02
| * | | rebase -i: honor --rerere-autoupdatePhillip Wood2017-08-02
| |/ /
* | | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-17
* | | sequencer: convert to struct object_idbrian m. carlson2017-07-17
|/ /
* | Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano2017-06-30
|\ \
| * | sequencer: print autostash messages to stderrJohannes Schindelin2017-06-19
* | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-24
|\ \ \
| * | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-16
* | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\ \ \ \
| * | | | config: don't include config.h by defaultBrandon Williams2017-06-15
* | | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-05
* | | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-13
|\ \ \ \ \
| * | | | | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-26
| | |/ / / | |/| | |
* | | | | Merge branch 'ab/c-translators-comment-style'Junio C Hamano2017-06-04
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | C style: use standard style for "TRANSLATORS" commentsÆvar Arnfjörð Bjarmason2017-05-31
| |/ / /
* | | | Merge branch 'pw/rebase-i-regression-fix'Junio C Hamano2017-05-29
|\ \ \ \ | | |/ / | |/| |
| * | | rebase -i: add missing newline to end of messagePhillip Wood2017-05-20
| * | | rebase -i: silence stash applyPhillip Wood2017-05-20
| * | | rebase -i: fix reflog messagePhillip Wood2017-05-20
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-05-29
|\ \ \ \
| * | | | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-08
| * | | | sequencer: convert do_recursive_merge to struct object_idbrian m. carlson2017-05-08
| * | | | merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-08
| * | | | sequencer: convert fast_forward_to to struct object_idbrian m. carlson2017-05-08
| * | | | Convert lookup_tree to struct object_idbrian m. carlson2017-05-08