summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-181-1/+1
|\
| * sequencer.c: unify an error messagejs/rebase-i-finalRalf Thielow2017-10-181-1/+1
* | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-171-2/+2
|\ \ | |/
| * sequencer.c: fix and unify error messages in rearrange_squash()Ralf Thielow2017-10-161-2/+2
* | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-091-1/+1
|\ \ | |/
| * i18n: add a missing space in messageJean-Noel Avila2017-10-091-1/+1
* | Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano2017-10-051-1/+1
|\ \
| * | use strbuf_addstr() for adding strings to strbufsRené Scharfe2017-10-021-1/+1
* | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-031-0/+531
|\ \ \ | |/ / |/| / | |/
| * rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-271-0/+196
| * rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin2017-07-271-0/+107
| * rebase -i: check for missing commits in the rebase--helperJohannes Schindelin2017-07-271-0/+122
| * rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin2017-07-271-0/+57
| * rebase -i: generate the script via rebase--helperJohannes Schindelin2017-07-271-0/+49
* | sequencer: release strbuf after use in save_head()Rene Scharfe2017-09-071-1/+4
* | Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano2017-08-221-1/+19
|\ \
| * | cherry-pick/revert: remember --rerere-autoupdatePhillip Wood2017-08-021-1/+9
| * | rebase -i: honor --rerere-autoupdatePhillip Wood2017-08-021-0/+10
| |/
* | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-171-3/+3
* | sequencer: convert to struct object_idbrian m. carlson2017-07-171-29/+30
|/
* Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano2017-06-301-5/+6
|\
| * sequencer: print autostash messages to stderrJohannes Schindelin2017-06-191-5/+6
* | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-2/+1
|\ \
| * | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-2/+1
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-2/+2
* | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-4/+4
|\ \ \ \
| * | | | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-261-4/+4
| | |/ / | |/| |
* | | | Merge branch 'ab/c-translators-comment-style'Junio C Hamano2017-06-041-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | C style: use standard style for "TRANSLATORS" commentsab/c-translators-comment-styleÆvar Arnfjörð Bjarmason2017-05-311-1/+2
| |/ /
* | | Merge branch 'pw/rebase-i-regression-fix'Junio C Hamano2017-05-291-1/+4
|\ \ \ | | |/ | |/|
| * | rebase -i: add missing newline to end of messagepw/rebase-i-regression-fixPhillip Wood2017-05-201-1/+1
| * | rebase -i: silence stash applyPhillip Wood2017-05-201-0/+2
| * | rebase -i: fix reflog messagePhillip Wood2017-05-201-0/+1
* | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-29/+30
|\ \ \
| * | | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | sequencer: convert do_recursive_merge to struct object_idbrian m. carlson2017-05-081-3/+3
| * | | merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | sequencer: convert fast_forward_to to struct object_idbrian m. carlson2017-05-081-11/+11
| * | | Convert lookup_tree to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-4/+4
| * | | Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson2017-05-081-10/+10
| * | | sequencer: convert some functions to struct object_idbrian m. carlson2017-05-081-6/+6
| * | | Convert struct cache_tree to use struct object_idbrian m. carlson2017-05-021-1/+2
| | |/ | |/|
* | | Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano2017-05-161-7/+4
|\ \ \ | |/ / |/| |
| * | sequencer: add newline before adding footersjt/use-trailer-api-in-commandsJonathan Tan2017-04-261-7/+4
* | | Merge branch 'sh/rebase-i-reread-todo-after-exec'Junio C Hamano2017-05-011-0/+22
|\ \ \
| * | | rebase -i: reread the todo list if `exec` touched itsh/rebase-i-reread-todo-after-execStephen Hicks2017-04-271-0/+22
View Lorry Controller Status