aboutsummaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAge
* Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-10
|\
| * merge_trees(): ensure that the callers release output bufferJohannes Schindelin2016-08-01
| * prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-26
* | Merge branch 'rs/use-strbuf-addstr'Junio C Hamano2016-08-08
|\ \ | |/ |/|
| * use strbuf_addstr() instead of strbuf_addf() with "%s"René Scharfe2016-08-05
| * Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-28
| |\
| * \ Merge branch 'mg/cherry-pick-multi-on-unborn' into maintJunio C Hamano2016-07-06
| |\ \
* | \ \ Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-13
|\ \ \ \
| * | | | i18n: sequencer: add period to error messageVasco Almeida2016-06-17
| * | | | i18n: sequencer: mark string for translationVasco Almeida2016-06-17
| * | | | i18n: sequencer: mark entire sentences for translationVasco Almeida2016-06-17
| |/ / /
* | | | Merge branch 'js/find-commit-subject-ignore-leading-blanks'Junio C Hamano2016-07-11
|\ \ \ \ | | |_|/ | |/| |
| * | | sequencer: use skip_blank_lines() to find the commit subjectJohannes Schindelin2016-06-29
* | | | Merge branch 'mg/cherry-pick-multi-on-unborn'Junio C Hamano2016-06-27
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | cherry-pick: allow to pick to unborn branchesMichael J Gruber2016-06-06
| |/
* | sequencer.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-09
* | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-26
|\ \
| * | sequencer: simplify memory allocation of get_messageJeff King2016-02-22
* | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-15
|/ /
* | Remove get_object_hash.brian m. carlson2015-11-20
* | Convert struct object to object_idbrian m. carlson2015-11-20
* | Add several uses of get_object_hash.brian m. carlson2015-11-20
* | Merge branch 'dt/refs-pseudo'Junio C Hamano2015-08-25
|\ \
| * | sequencer: replace write_cherry_pick_head with update_refDavid Turner2015-07-31
| |/
* | memoize common git-path "constant" filesJeff King2015-08-10
|/
* Merge branch 'mg/sequencer-commit-messages-always-verbatim'Junio C Hamano2015-03-17
|\
| * sequencer: preserve commit messagesMichael J Gruber2015-03-06
* | ref_transaction_update(): remove "have_old" parameterMichael Haggerty2015-02-17
* | Merge branch 'cc/interpret-trailers-more'Junio C Hamano2014-12-22
|\ \
| * \ Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-10
| |\ \
| | * | merge & sequencer: turn "Conflicts:" hint into a commentJunio C Hamano2014-10-28
| | * | merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano2014-10-24
* | | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-15
* | | | refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg2014-10-15
* | | | lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty2014-10-01
|/ / /
* | | Merge branch 'rs/ref-transaction-1'Junio C Hamano2014-09-11
|\ \ \
| * | | sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg2014-09-03
* | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-16
|\ \ \ \
| * | | | cache-tree: mark istate->cache_changed on cache tree updateNguyễn Thái Ngọc Duy2014-06-13
| * | | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-13
| * | | | sequencer: do not update/refresh index if the lock cannot be heldNguyễn Thái Ngọc Duy2014-04-29
* | | | | Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-09
|\ \ \ \ \
| * | | | | sequencer: use argv_array_pushfJeff King2014-06-19
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-02
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | commit: record buffer length in cacheJeff King2014-06-13
| * | | | use get_commit_buffer everywhereJeff King2014-06-13
| * | | | convert logmsg_reencode to get_commit_bufferJeff King2014-06-13
| * | | | sequencer: use logmsg_reencode in get_messageJeff King2014-06-12
| | |/ / | |/| |
* | | | Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'Junio C Hamano2014-06-25
|\ \ \ \ | |_|/ / |/| | |
| * | | sequencer: signal failed ff as an aborted, not a conflicted mergeFabian Ruch2014-06-09
| |/ /