summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2016-02-22sequencer: simplify memory allocation of get_messageJeff King
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Convert struct object to object_idbrian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-08-25Merge branch 'dt/refs-pseudo'Junio C Hamano
2015-08-10memoize common git-path "constant" filesJeff King
2015-07-31sequencer: replace write_cherry_pick_head with update_refDavid Turner
2015-03-17Merge branch 'mg/sequencer-commit-messages-always-verbatim'Junio C Hamano
2015-03-06sequencer: preserve commit messagesMichael J Gruber
2015-02-17ref_transaction_update(): remove "have_old" parameterMichael Haggerty
2014-12-22Merge branch 'cc/interpret-trailers-more'Junio C Hamano
2014-11-10Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano
2014-10-28merge & sequencer: turn "Conflicts:" hint into a commentJunio C Hamano
2014-10-24merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg
2014-10-15refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty
2014-09-11Merge branch 'rs/ref-transaction-1'Junio C Hamano
2014-09-03sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg
2014-07-16Merge branch 'nd/split-index'Junio C Hamano
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano
2014-07-02Merge branch 'jk/commit-buffer-length'Junio C Hamano
2014-06-25Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'Junio C Hamano
2014-06-19sequencer: use argv_array_pushfJeff King
2014-06-13commit: record buffer length in cacheJeff King
2014-06-13use get_commit_buffer everywhereJeff King
2014-06-13convert logmsg_reencode to get_commit_bufferJeff King
2014-06-13cache-tree: mark istate->cache_changed on cache tree updateNguyễn Thái Ngọc Duy
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy
2014-06-12sequencer: use logmsg_reencode in get_messageJeff King
2014-06-09sequencer: signal failed ff as an aborted, not a conflicted mergeFabian Ruch
2014-04-29sequencer: do not update/refresh index if the lock cannot be heldNguyễn Thái Ngọc Duy
2014-04-17sequencer.c: check for lock failure and bail early in fast_forward_toRonnie Sahlberg
2014-01-27cherry-pick, revert: add the --gpg-sign optionNicolas Vigier
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder
2013-08-30refs: report ref type from lock_any_ref_for_updateBrad King
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy
2013-06-27Merge branch 'rr/cherry-pick-fast-forward-reflog-message'Junio C Hamano
2013-06-19sequencer: write useful reflog message for fast-forwardRamkumar Ramachandra
2013-06-06sequencer: avoid leaking message buffer when refusing to create an empty commitFelipe Contreras
2013-06-03sequencer: remove useless indentationFelipe Contreras
2013-05-09Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano
2013-05-09cherry-pick: picking a tag that resolves to a commit is OKJunio C Hamano
2013-04-19Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano
2013-04-12Sync with 'maint'Junio C Hamano
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini
2013-04-11cherry-pick: make sure all input objects are commitsMiklos Vajna
2013-04-01Merge branch 'bc/append-signed-off-by'Junio C Hamano
2013-02-23git-commit: populate the edit buffer with 2 blank lines before s-o-bBrandon Casey
2013-02-12sequencer.c: teach append_signoff to avoid adding a duplicate newlineBrandon Casey