aboutsummaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2016-07-28Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano1-4/+2
2016-07-26prepare the builtins for a libified merge_recursive()Johannes Schindelin1-0/+4
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano1-5/+10
2016-07-11Merge branch 'js/find-commit-subject-ignore-leading-blanks'Junio C Hamano1-4/+2
2016-07-06Merge branch 'mg/cherry-pick-multi-on-unborn' into maintJunio C Hamano1-5/+6
2016-06-29sequencer: use skip_blank_lines() to find the commit subjectJohannes Schindelin1-4/+2
2016-06-27Merge branch 'mg/cherry-pick-multi-on-unborn'Junio C Hamano1-5/+6
2016-06-17i18n: sequencer: add period to error messageVasco Almeida1-1/+1
2016-06-17i18n: sequencer: mark string for translationVasco Almeida1-1/+1
2016-06-17i18n: sequencer: mark entire sentences for translationVasco Almeida1-3/+8
2016-06-06cherry-pick: allow to pick to unborn branchesMichael J Gruber1-5/+6
2016-05-09sequencer.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano1-19/+10
2016-02-22sequencer: simplify memory allocation of get_messageJeff King1-19/+10
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano1-1/+1
2015-11-20Remove get_object_hash.brian m. carlson1-9/+9
2015-11-20Convert struct object to object_idbrian m. carlson1-11/+11
2015-11-20Add several uses of get_object_hash.brian m. carlson1-9/+9
2015-08-25Merge branch 'dt/refs-pseudo'Junio C Hamano1-19/+4
2015-08-10memoize common git-path "constant" filesJeff King1-47/+40
2015-07-31sequencer: replace write_cherry_pick_head with update_refDavid Turner1-19/+4
2015-03-17Merge branch 'mg/sequencer-commit-messages-always-verbatim'Junio C Hamano1-0/+5
2015-03-06sequencer: preserve commit messagesMichael J Gruber1-0/+5
2015-02-17ref_transaction_update(): remove "have_old" parameterMichael Haggerty1-1/+1
2014-12-22Merge branch 'cc/interpret-trailers-more'Junio C Hamano1-15/+19
2014-11-10Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano1-15/+19
2014-10-28merge & sequencer: turn "Conflicts:" hint into a commentJunio C Hamano1-4/+3
2014-10-24merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano1-15/+20
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg1-2/+2
2014-10-15refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg1-2/+2
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-0/+1
2014-09-11Merge branch 'rs/ref-transaction-1'Junio C Hamano1-8/+18
2014-09-03sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg1-8/+18
2014-07-16Merge branch 'nd/split-index'Junio C Hamano1-10/+6
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano1-7/+2
2014-07-02Merge branch 'jk/commit-buffer-length'Junio C Hamano1-41/+8
2014-06-25Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'Junio C Hamano1-1/+1
2014-06-19sequencer: use argv_array_pushfJeff King1-7/+2
2014-06-13commit: record buffer length in cacheJeff King1-1/+1
2014-06-13use get_commit_buffer everywhereJeff King1-1/+3
2014-06-13convert logmsg_reencode to get_commit_bufferJeff King1-1/+1
2014-06-13cache-tree: mark istate->cache_changed on cache tree updateNguyễn Thái Ngọc Duy1-3/+1
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy1-6/+4
2014-06-12sequencer: use logmsg_reencode in get_messageJeff King1-40/+5
2014-06-09sequencer: signal failed ff as an aborted, not a conflicted mergeFabian Ruch1-1/+1
2014-04-29sequencer: do not update/refresh index if the lock cannot be heldNguyễn Thái Ngọc Duy1-1/+1
2014-04-17sequencer.c: check for lock failure and bail early in fast_forward_toRonnie Sahlberg1-0/+4
2014-01-27cherry-pick, revert: add the --gpg-sign optionNicolas Vigier1-0/+11
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-4/+4
2013-08-30refs: report ref type from lock_any_ref_for_updateBrad King1-1/+2