aboutsummaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAge
* 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
| |/ /
* | | sequencer.c: check for lock failure and bail early in fast_forward_toRonnie Sahlberg2014-04-17
|/ /
* | cherry-pick, revert: add the --gpg-sign optionNicolas Vigier2014-01-27
* | replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
|/
* refs: report ref type from lock_any_ref_for_updateBrad King2013-08-30
* Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy2013-07-09
* Merge branch 'rr/cherry-pick-fast-forward-reflog-message'Junio C Hamano2013-06-27
|\
| * sequencer: write useful reflog message for fast-forwardRamkumar Ramachandra2013-06-19
* | sequencer: avoid leaking message buffer when refusing to create an empty commitFelipe Contreras2013-06-06
* | sequencer: remove useless indentationFelipe Contreras2013-06-03
|/
* Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano2013-05-09
|\
| * cherry-pick: picking a tag that resolves to a commit is OKJunio C Hamano2013-05-09
* | Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano2013-04-19
|\ \ | |/
| * cherry-pick: make sure all input objects are commitsMiklos Vajna2013-04-11
* | Sync with 'maint'Junio C Hamano2013-04-12
|\ \ | |/ |/|
| * Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-12
* | Merge branch 'bc/append-signed-off-by'Junio C Hamano2013-04-01
|\ \ | |/ |/|
| * git-commit: populate the edit buffer with 2 blank lines before s-o-bBrandon Casey2013-02-23
| * sequencer.c: teach append_signoff to avoid adding a duplicate newlineBrandon Casey2013-02-12
| * sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey2013-02-12
| * sequencer.c: always separate "(cherry picked from" from commit bodyBrandon Casey2013-02-12
| * sequencer.c: require a conforming footer to be preceded by a blank lineBrandon Casey2013-02-12
| * sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footerBrandon Casey2013-02-12
| * commit, cherry-pick -s: remove broken support for multiline rfc2822 fieldsBrandon Casey2013-02-12
| * sequencer.c: rework search for start of footer to improve clarityJonathan Nieder2013-02-12
* | learn to pick/revert into unborn branchMartin von Zweigbergk2012-12-23
|/
* Merge branch 'jc/same-encoding'Junio C Hamano2012-11-15
|\
| * reencode_string(): introduce and use same_encoding()Junio C Hamano2012-11-04
* | Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-29