summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* sequencer: ensure to release the lock when we could not read the indexjs/sequencer-wo-dieJohannes Schindelin2016-09-091-2/+6
* sequencer: lib'ify fast_forward_to()Johannes Schindelin2016-09-091-1/+1
* sequencer: lib'ify save_opts()Johannes Schindelin2016-09-091-11/+14
* sequencer: lib'ify save_todo()Johannes Schindelin2016-09-091-7/+15
* sequencer: lib'ify save_head()Johannes Schindelin2016-09-091-7/+18
* sequencer: lib'ify create_seq_dir()Johannes Schindelin2016-09-091-2/+2
* sequencer: lib'ify read_populate_opts()Johannes Schindelin2016-09-091-6/+14
* sequencer: lib'ify read_populate_todo()Johannes Schindelin2016-09-091-5/+9
* sequencer: lib'ify read_and_refresh_cache()Johannes Schindelin2016-09-091-5/+10
* sequencer: lib'ify prepare_revs()Johannes Schindelin2016-09-091-3/+4
* sequencer: lib'ify walk_revs_populate_todo()Johannes Schindelin2016-09-091-4/+6
* sequencer: lib'ify do_pick_commit()Johannes Schindelin2016-09-091-1/+1
* sequencer: lib'ify do_recursive_merge()Johannes Schindelin2016-09-091-1/+2
* sequencer: lib'ify write_message()Johannes Schindelin2016-09-091-8/+11
* sequencer: do not die() in do_pick_commit()Johannes Schindelin2016-08-291-6/+8
* sequencer: lib'ify sequencer_pick_revisions()Johannes Schindelin2016-08-291-4/+5
* i18n: fix typos for translationJean-Noel Avila2016-08-241-1/+1
* 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