summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2018-03-21Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano-6/+5
2018-03-14Merge branch 'ma/roll-back-lockfiles'Junio C Hamano-18/+14
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano-1/+1
2018-03-06Merge branch 'rs/strbuf-read-file-or-whine'Junio C Hamano-46/+28
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano-0/+4
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren-6/+5
2018-02-28sequencer: do not roll back lockfile unnecessarilyMartin Ågren-12/+6
2018-02-27sequencer: always roll back lock in `do_recursive_merge()`Martin Ågren-1/+3
2018-02-27sequencer: make lockfiles non-staticMartin Ågren-5/+5
2018-02-22sequencer: factor out strbuf_read_file_or_whine()René Scharfe-46/+28
2018-02-15Merge branch 'po/object-id'Junio C Hamano-2/+2
2018-02-14object: rename function 'typename' to 'type_name'Brandon Williams-1/+1
2018-02-13Merge branch 'pw/sequencer-in-process-commit'Junio C Hamano-8/+530
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy-0/+4
2018-01-24sequencer: run 'prepare-commit-msg' hookPhillip Wood-13/+56
2017-12-27sequencer: do not invent whitespace when transforming OIDsJohannes Schindelin-1/+4
2017-12-27sequencer: report when noop has an argumentJohannes Schindelin-4/+9
2017-12-27sequencer: remove superfluous conditionalJohannes Schindelin-3/+1
2017-12-27sequencer: strip bogus LF at end of error messagesJohannes Schindelin-4/+4
2017-12-27Merge branch 'lb/rebase-i-short-command-names'Junio C Hamano-43/+83
2017-12-27sequencer.c: drop 'const' from function return typeJunio C Hamano-1/+1
2017-12-22sequencer: assign only free()able strings to gpg_signJohannes Schindelin-1/+1
2017-12-19Merge branch 'en/rename-progress'Junio C Hamano-0/+2
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano-3/+3
2017-12-13sequencer: improve config handlingPhillip Wood-39/+48
2017-12-05rebase -i: learn to abbreviate command namesLiam Beguin-2/+14
2017-12-05rebase -i -x: add exec commands via the rebase--helperLiam Beguin-0/+39
2017-12-05rebase -i: update functions to use a flags parameterLiam Beguin-4/+5
2017-12-05rebase -i: refactor transform_todo_idsLiam Beguin-41/+28
2017-12-04rebase -i: set commit to null in exec commandsLiam Beguin-0/+1
2017-11-27Merge branch 'pw/sequencer-recover-from-unlockable-index'Junio C Hamano-1/+2
2017-11-24sequencer: try to commit without forking 'git commit'Phillip Wood-2/+176
2017-11-24sequencer: load commit related configPhillip Wood-0/+34
2017-11-24sequencer: simplify adding Signed-off-by: trailerPhillip Wood-5/+3
2017-11-24commit: move print_commit_summary() to libgitPhillip Wood-0/+119
2017-11-18commit: move post-rewrite code to libgitPhillip Wood-0/+47
2017-11-18Add a function to update HEAD after creating a commitPhillip Wood-1/+38
2017-11-16sequencer: reschedule pick if index can't be lockedPhillip Wood-1/+2
2017-11-15sequencer: show rename progress during cherry picksElijah Newren-0/+1
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano-3/+3
2017-11-15Merge branch 'rs/sequencer-rewrite-file-cleanup'Junio C Hamano-29/+16
2017-11-15Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano-1/+6
2017-11-14sequencer: warn when internal merge may be suboptimal due to renameLimitElijah Newren-0/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson-3/+3
2017-11-11commit: move empty message checks to libgitPhillip Wood-0/+61
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano-2/+3
2017-11-06Merge branch 'bc/object-id'Junio C Hamano-7/+7
2017-11-06Merge branch 'jk/rebase-i-exec-gitdir-fix'Junio C Hamano-1/+6
2017-11-06Merge branch 'ma/lockfile-fixes'Junio C Hamano-1/+0
2017-11-06refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty-3/+3