summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2016-08-24i18n: fix typos for translationJean-Noel Avila
2016-08-10Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano
2016-08-08Merge branch 'rs/use-strbuf-addstr'Junio C Hamano
2016-08-05use strbuf_addstr() instead of strbuf_addf() with "%s"René Scharfe
2016-08-01merge_trees(): ensure that the callers release output bufferJohannes Schindelin
2016-07-28Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano
2016-07-26prepare the builtins for a libified merge_recursive()Johannes Schindelin
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano
2016-07-11Merge branch 'js/find-commit-subject-ignore-leading-blanks'Junio C Hamano
2016-07-06Merge branch 'mg/cherry-pick-multi-on-unborn' into maintJunio C Hamano
2016-06-29sequencer: use skip_blank_lines() to find the commit subjectJohannes Schindelin
2016-06-27Merge branch 'mg/cherry-pick-multi-on-unborn'Junio C Hamano
2016-06-17i18n: sequencer: add period to error messageVasco Almeida
2016-06-17i18n: sequencer: mark string for translationVasco Almeida
2016-06-17i18n: sequencer: mark entire sentences for translationVasco Almeida
2016-06-06cherry-pick: allow to pick to unborn branchesMichael J Gruber
2016-05-09sequencer.c: use error_errno()Nguyễn Thái Ngọc Duy
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano
2016-02-22sequencer: simplify memory allocation of get_messageJeff King
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano
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