summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2014-12-22Merge branch 'cc/interpret-trailers-more'Libravatar Junio C Hamano1-15/+19
2014-11-10Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreLibravatar Junio C Hamano1-15/+19
2014-10-28merge & sequencer: turn "Conflicts:" hint into a commentLibravatar Junio C Hamano1-4/+3
2014-10-24merge & sequencer: unify codepaths that write "Conflicts:" hintLibravatar Junio C Hamano1-15/+20
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldLibravatar Ronnie Sahlberg1-2/+2
2014-10-15refs.c: pass the ref log message to _create/delete/update instead of _commitLibravatar Ronnie Sahlberg1-2/+2
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cLibravatar Michael Haggerty1-0/+1
2014-09-11Merge branch 'rs/ref-transaction-1'Libravatar Junio C Hamano1-8/+18
2014-09-03sequencer.c: use ref transactions for all ref updatesLibravatar Ronnie Sahlberg1-8/+18
2014-07-16Merge branch 'nd/split-index'Libravatar Junio C Hamano1-10/+6
2014-07-09Merge branch 'jk/xstrfmt'Libravatar Junio C Hamano1-7/+2
2014-07-02Merge branch 'jk/commit-buffer-length'Libravatar Junio C Hamano1-41/+8
2014-06-25Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'Libravatar Junio C Hamano1-1/+1
2014-06-19sequencer: use argv_array_pushfLibravatar Jeff King1-7/+2
2014-06-13commit: record buffer length in cacheLibravatar Jeff King1-1/+1
2014-06-13use get_commit_buffer everywhereLibravatar Jeff King1-1/+3
2014-06-13convert logmsg_reencode to get_commit_bufferLibravatar Jeff King1-1/+1
2014-06-13cache-tree: mark istate->cache_changed on cache tree updateLibravatar Nguyễn Thái Ngọc Duy1-3/+1
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheLibravatar Nguyễn Thái Ngọc Duy1-6/+4
2014-06-12sequencer: use logmsg_reencode in get_messageLibravatar Jeff King1-40/+5
2014-06-09sequencer: signal failed ff as an aborted, not a conflicted mergeLibravatar Fabian Ruch1-1/+1
2014-04-29sequencer: do not update/refresh index if the lock cannot be heldLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2014-04-17sequencer.c: check for lock failure and bail early in fast_forward_toLibravatar Ronnie Sahlberg1-0/+4
2014-01-27cherry-pick, revert: add the --gpg-sign optionLibravatar Nicolas Vigier1-0/+11
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Libravatar Christian Couder1-4/+4
2013-08-30refs: report ref type from lock_any_ref_for_updateLibravatar Brad King1-1/+2
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-3/+4
2013-06-27Merge branch 'rr/cherry-pick-fast-forward-reflog-message'Libravatar Junio C Hamano1-3/+8
2013-06-19sequencer: write useful reflog message for fast-forwardLibravatar Ramkumar Ramachandra1-3/+8
2013-06-06sequencer: avoid leaking message buffer when refusing to create an empty commitLibravatar Felipe Contreras1-2/+4
2013-06-03sequencer: remove useless indentationLibravatar Felipe Contreras1-7/+9
2013-05-09Merge branch 'mv/sequencer-pick-error-diag'Libravatar Junio C Hamano1-3/+3
2013-05-09cherry-pick: picking a tag that resolves to a commit is OKLibravatar Junio C Hamano1-3/+3
2013-04-19Merge branch 'mv/sequencer-pick-error-diag'Libravatar Junio C Hamano1-0/+18
2013-04-12Sync with 'maint'Libravatar Junio C Hamano1-1/+1
2013-04-12Correct common spelling mistakes in comments and testsLibravatar Stefano Lattarini1-1/+1
2013-04-11cherry-pick: make sure all input objects are commitsLibravatar Miklos Vajna1-0/+18
2013-04-01Merge branch 'bc/append-signed-off-by'Libravatar Junio C Hamano1-51/+141
2013-02-23git-commit: populate the edit buffer with 2 blank lines before s-o-bLibravatar Brandon Casey1-2/+25
2013-02-12sequencer.c: teach append_signoff to avoid adding a duplicate newlineLibravatar Brandon Casey1-2/+13
2013-02-12sequencer.c: teach append_signoff how to detect duplicate s-o-bLibravatar Brandon Casey1-14/+45
2013-02-12sequencer.c: always separate "(cherry picked from" from commit bodyLibravatar Brandon Casey1-63/+65
2013-02-12sequencer.c: require a conforming footer to be preceded by a blank lineLibravatar Brandon Casey1-1/+5
2013-02-12sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footerLibravatar Brandon Casey1-14/+37
2013-02-12commit, cherry-pick -s: remove broken support for multiline rfc2822 fieldsLibravatar Brandon Casey1-6/+0
2013-02-12sequencer.c: rework search for start of footer to improve clarityLibravatar Jonathan Nieder1-4/+6
2012-12-23learn to pick/revert into unborn branchLibravatar Martin von Zweigbergk1-8/+12
2012-11-15Merge branch 'jc/same-encoding'Libravatar Junio C Hamano1-1/+1
2012-11-04reencode_string(): introduce and use same_encoding()Libravatar Junio C Hamano1-1/+1
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aLibravatar Nguyễn Thái Ngọc Duy1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 07:26:57 +0000