summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-101-0/+5
|\
| * merge_trees(): ensure that the callers release output bufferJohannes Schindelin2016-08-011-0/+1
| * prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-261-0/+4
* | Merge branch 'rs/use-strbuf-addstr'Junio C Hamano2016-08-081-1/+1
|\ \ | |/ |/|
| * use strbuf_addstr() instead of strbuf_addf() with "%s"rs/use-strbuf-addstrRené Scharfe2016-08-051-1/+1
| * Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-281-4/+2
| |\
| * \ Merge branch 'mg/cherry-pick-multi-on-unborn' into maintJunio C Hamano2016-07-061-5/+6
| |\ \
* | \ \ Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-131-5/+10
|\ \ \ \
| * | | | i18n: sequencer: add period to error messageVasco Almeida2016-06-171-1/+1
| * | | | i18n: sequencer: mark string for translationVasco Almeida2016-06-171-1/+1
| * | | | i18n: sequencer: mark entire sentences for translationVasco Almeida2016-06-171-3/+8
| |/ / /
* | | | Merge branch 'js/find-commit-subject-ignore-leading-blanks'Junio C Hamano2016-07-111-4/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | sequencer: use skip_blank_lines() to find the commit subjectJohannes Schindelin2016-06-291-4/+2
* | | | Merge branch 'mg/cherry-pick-multi-on-unborn'Junio C Hamano2016-06-271-5/+6
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | cherry-pick: allow to pick to unborn branchesmg/cherry-pick-multi-on-unbornMichael J Gruber2016-06-061-5/+6
| |/
* | sequencer.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-2/+1
* | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-261-19/+10
|\ \
| * | sequencer: simplify memory allocation of get_messageJeff King2016-02-221-19/+10
* | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-1/+1
|/ /
* | Remove get_object_hash.brian m. carlson2015-11-201-9/+9
* | Convert struct object to object_idbrian m. carlson2015-11-201-11/+11
* | Add several uses of get_object_hash.brian m. carlson2015-11-201-9/+9
* | Merge branch 'dt/refs-pseudo'Junio C Hamano2015-08-251-19/+4
|\ \
| * | sequencer: replace write_cherry_pick_head with update_refDavid Turner2015-07-311-19/+4
| |/
* | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-101-47/+40
|/
* Merge branch 'mg/sequencer-commit-messages-always-verbatim'Junio C Hamano2015-03-171-0/+5
|\
| * sequencer: preserve commit messagesmg/sequencer-commit-messages-always-verbatimMichael J Gruber2015-03-061-0/+5
* | ref_transaction_update(): remove "have_old" parameterMichael Haggerty2015-02-171-1/+1
* | Merge branch 'cc/interpret-trailers-more'Junio C Hamano2014-12-221-15/+19
|\ \
| * \ Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-101-15/+19
| |\ \
| | * | merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hintJunio C Hamano2014-10-281-4/+3
| | * | merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano2014-10-241-15/+20
* | | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-2/+2
* | | | refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg2014-10-151-2/+2
* | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
|/ / /
* | | Merge branch 'rs/ref-transaction-1'Junio C Hamano2014-09-111-8/+18
|\ \ \
| * | | sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg2014-09-031-8/+18
* | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-161-10/+6
|\ \ \ \
| * | | | cache-tree: mark istate->cache_changed on cache tree updateNguyễn Thái Ngọc Duy2014-06-131-3/+1
| * | | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-6/+4
| * | | | sequencer: do not update/refresh index if the lock cannot be heldNguyễn Thái Ngọc Duy2014-04-291-1/+1
* | | | | Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-091-7/+2
|\ \ \ \ \
| * | | | | sequencer: use argv_array_pushfJeff King2014-06-191-7/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-021-41/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | commit: record buffer length in cacheJeff King2014-06-131-1/+1
| * | | | use get_commit_buffer everywhereJeff King2014-06-131-1/+3
| * | | | convert logmsg_reencode to get_commit_bufferJeff King2014-06-131-1/+1
| * | | | sequencer: use logmsg_reencode in get_messageJeff King2014-06-121-40/+5
| | |/ / | |/| |
* | | | Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'Junio C Hamano2014-06-251-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | sequencer: signal failed ff as an aborted, not a conflicted mergefr/sequencer-fail-with-not-one-upon-no-ffFabian Ruch2014-06-091-1/+1
| |/ /
View Lorry Controller Status