summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2018-03-29rebase: extend --signoff supportLibravatar Phillip Wood1-1/+7
2018-03-29Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoffLibravatar Junio C Hamano1-2/+6
2018-03-29rebase -i --keep-empty: don't prune empty commitsLibravatar Phillip Wood1-2/+6
2018-03-21Merge branch 'ma/skip-writing-unchanged-index'Libravatar Junio C Hamano1-6/+5
2018-03-14Merge branch 'ma/roll-back-lockfiles'Libravatar Junio C Hamano1-18/+14
2018-03-14sha1_file: convert sha1_object_info* to object_idLibravatar brian m. carlson1-1/+2
2018-03-14Convert find_unique_abbrev* to struct object_idLibravatar brian m. carlson1-1/+1
2018-03-14cache-tree: convert write_*_as_tree to object_idLibravatar brian m. carlson1-2/+2
2018-03-06Merge branch 'bw/c-plus-plus'Libravatar Junio C Hamano1-1/+1
2018-03-06Merge branch 'rs/strbuf-read-file-or-whine'Libravatar Junio C Hamano1-46/+28
2018-03-06Merge branch 'nd/rebase-show-current-patch'Libravatar Junio C Hamano1-0/+4
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexLibravatar Martin Ågren1-6/+5
2018-02-28sequencer: do not roll back lockfile unnecessarilyLibravatar Martin Ågren1-12/+6
2018-02-27sequencer: always roll back lock in `do_recursive_merge()`Libravatar Martin Ågren1-1/+3
2018-02-27sequencer: make lockfiles non-staticLibravatar Martin Ågren1-5/+5
2018-02-22sequencer: factor out strbuf_read_file_or_whine()Libravatar René Scharfe1-46/+28
2018-02-15Merge branch 'po/object-id'Libravatar Junio C Hamano1-2/+2
2018-02-14object: rename function 'typename' to 'type_name'Libravatar Brandon Williams1-1/+1
2018-02-13Merge branch 'pw/sequencer-in-process-commit'Libravatar Junio C Hamano1-8/+530
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADLibravatar Nguyễn Thái Ngọc Duy1-0/+4
2018-01-24sequencer: run 'prepare-commit-msg' hookLibravatar Phillip Wood1-13/+56
2017-12-27sequencer: do not invent whitespace when transforming OIDsLibravatar Johannes Schindelin1-1/+4
2017-12-27sequencer: report when noop has an argumentLibravatar Johannes Schindelin1-4/+9
2017-12-27sequencer: remove superfluous conditionalLibravatar Johannes Schindelin1-3/+1
2017-12-27sequencer: strip bogus LF at end of error messagesLibravatar Johannes Schindelin1-4/+4
2017-12-27Merge branch 'lb/rebase-i-short-command-names'Libravatar Junio C Hamano1-43/+83
2017-12-27sequencer.c: drop 'const' from function return typeLibravatar Junio C Hamano1-1/+1
2017-12-22sequencer: assign only free()able strings to gpg_signLibravatar Johannes Schindelin1-1/+1
2017-12-19Merge branch 'en/rename-progress'Libravatar Junio C Hamano1-0/+2
2017-12-13Merge branch 'bc/hash-algo'Libravatar Junio C Hamano1-3/+3
2017-12-13sequencer: improve config handlingLibravatar Phillip Wood1-39/+48
2017-12-05rebase -i: learn to abbreviate command namesLibravatar Liam Beguin1-2/+14
2017-12-05rebase -i -x: add exec commands via the rebase--helperLibravatar Liam Beguin1-0/+39
2017-12-05rebase -i: update functions to use a flags parameterLibravatar Liam Beguin1-4/+5
2017-12-05rebase -i: refactor transform_todo_idsLibravatar Liam Beguin1-41/+28
2017-12-04rebase -i: set commit to null in exec commandsLibravatar Liam Beguin1-0/+1
2017-11-27Merge branch 'pw/sequencer-recover-from-unlockable-index'Libravatar Junio C Hamano1-1/+2
2017-11-24sequencer: try to commit without forking 'git commit'Libravatar Phillip Wood1-2/+176
2017-11-24sequencer: load commit related configLibravatar Phillip Wood1-0/+34
2017-11-24sequencer: simplify adding Signed-off-by: trailerLibravatar Phillip Wood1-5/+3
2017-11-24commit: move print_commit_summary() to libgitLibravatar Phillip Wood1-0/+119
2017-11-18commit: move post-rewrite code to libgitLibravatar Phillip Wood1-0/+47
2017-11-18Add a function to update HEAD after creating a commitLibravatar Phillip Wood1-1/+38
2017-11-16sequencer: reschedule pick if index can't be lockedLibravatar Phillip Wood1-1/+2
2017-11-15sequencer: show rename progress during cherry picksLibravatar Elijah Newren1-0/+1
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Libravatar Junio C Hamano1-3/+3
2017-11-15Merge branch 'rs/sequencer-rewrite-file-cleanup'Libravatar Junio C Hamano1-29/+16
2017-11-15Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintLibravatar Junio C Hamano1-1/+6
2017-11-14sequencer: warn when internal merge may be suboptimal due to renameLimitLibravatar Elijah Newren1-0/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionLibravatar brian m. carlson1-3/+3