summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ /
* | | sequencer.c: check for lock failure and bail early in fast_forward_toRonnie Sahlberg2014-04-171-0/+4
|/ /
* | cherry-pick, revert: add the --gpg-sign optionNicolas Vigier2014-01-271-0/+11
* | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-4/+4
|/
* refs: report ref type from lock_any_ref_for_updateBrad King2013-08-301-1/+2
* Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-3/+4
* Merge branch 'rr/cherry-pick-fast-forward-reflog-message'Junio C Hamano2013-06-271-3/+8
|\
| * sequencer: write useful reflog message for fast-forwardRamkumar Ramachandra2013-06-191-3/+8
* | sequencer: avoid leaking message buffer when refusing to create an empty commitFelipe Contreras2013-06-061-2/+4
* | sequencer: remove useless indentationFelipe Contreras2013-06-031-7/+9
|/
* Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano2013-05-091-3/+3
|\
| * cherry-pick: picking a tag that resolves to a commit is OKJunio C Hamano2013-05-091-3/+3
* | Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano2013-04-191-0/+18
|\ \ | |/
| * cherry-pick: make sure all input objects are commitsMiklos Vajna2013-04-111-0/+18
* | Sync with 'maint'Junio C Hamano2013-04-121-1/+1
|\ \ | |/ |/|
| * Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-121-1/+1
* | Merge branch 'bc/append-signed-off-by'Junio C Hamano2013-04-011-51/+141
|\ \ | |/ |/|
| * git-commit: populate the edit buffer with 2 blank lines before s-o-bBrandon Casey2013-02-231-2/+25
| * sequencer.c: teach append_signoff to avoid adding a duplicate newlineBrandon Casey2013-02-121-2/+13
| * sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey2013-02-121-14/+45
| * sequencer.c: always separate "(cherry picked from" from commit bodyBrandon Casey2013-02-121-63/+65
| * sequencer.c: require a conforming footer to be preceded by a blank lineBrandon Casey2013-02-121-1/+5
| * sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footerBrandon Casey2013-02-121-14/+37
| * commit, cherry-pick -s: remove broken support for multiline rfc2822 fieldsBrandon Casey2013-02-121-6/+0
| * sequencer.c: rework search for start of footer to improve clarityJonathan Nieder2013-02-121-4/+6
* | learn to pick/revert into unborn branchMartin von Zweigbergk2012-12-231-8/+12
|/
* Merge branch 'jc/same-encoding'Junio C Hamano2012-11-151-1/+1
|\
| * reencode_string(): introduce and use same_encoding()Junio C Hamano2012-11-041-1/+1
* | Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-291-1/+1
View Lorry Controller Status