| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'mg/sequencer-commit-messages-always-verbatim' | Junio C Hamano | 2015-03-17 | 1 | -0/+5 |
|\ |
|
| * | sequencer: preserve commit messagesmg/sequencer-commit-messages-always-verbatim | Michael J Gruber | 2015-03-06 | 1 | -0/+5 |
* | | ref_transaction_update(): remove "have_old" parameter | Michael Haggerty | 2015-02-17 | 1 | -1/+1 |
* | | Merge branch 'cc/interpret-trailers-more' | Junio C Hamano | 2014-12-22 | 1 | -15/+19 |
|\ \ |
|
| * \ | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more | Junio C Hamano | 2014-11-10 | 1 | -15/+19 |
| |\ \ |
|
| | * | | merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hint | Junio C Hamano | 2014-10-28 | 1 | -4/+3 |
| | * | | merge & sequencer: unify codepaths that write "Conflicts:" hint | Junio C Hamano | 2014-10-24 | 1 | -15/+20 |
* | | | | refs.c: change resolve_ref_unsafe reading argument to be a flags field | Ronnie Sahlberg | 2014-10-15 | 1 | -2/+2 |
* | | | | refs.c: pass the ref log message to _create/delete/update instead of _commit | Ronnie Sahlberg | 2014-10-15 | 1 | -2/+2 |
* | | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfile | Michael Haggerty | 2014-10-01 | 1 | -0/+1 |
|/ / / |
|
* | | | Merge branch 'rs/ref-transaction-1' | Junio C Hamano | 2014-09-11 | 1 | -8/+18 |
|\ \ \ |
|
| * | | | sequencer.c: use ref transactions for all ref updates | Ronnie Sahlberg | 2014-09-03 | 1 | -8/+18 |
* | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 | 1 | -10/+6 |
|\ \ \ \ |
|
| * | | | | cache-tree: mark istate->cache_changed on cache tree update | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -3/+1 |
| * | | | | read-cache: new API write_locked_index instead of write_index/write_cache | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -6/+4 |
| * | | | | sequencer: do not update/refresh index if the lock cannot be held | Nguyễn Thái Ngọc Duy | 2014-04-29 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/xstrfmt' | Junio C Hamano | 2014-07-09 | 1 | -7/+2 |
|\ \ \ \ \ |
|
| * | | | | | sequencer: use argv_array_pushf | Jeff King | 2014-06-19 | 1 | -7/+2 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'jk/commit-buffer-length' | Junio C Hamano | 2014-07-02 | 1 | -41/+8 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | commit: record buffer length in cache | Jeff King | 2014-06-13 | 1 | -1/+1 |
| * | | | | use get_commit_buffer everywhere | Jeff King | 2014-06-13 | 1 | -1/+3 |
| * | | | | convert logmsg_reencode to get_commit_buffer | Jeff King | 2014-06-13 | 1 | -1/+1 |
| * | | | | sequencer: use logmsg_reencode in get_message | Jeff King | 2014-06-12 | 1 | -40/+5 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff' | Junio C Hamano | 2014-06-25 | 1 | -1/+1 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | sequencer: signal failed ff as an aborted, not a conflicted mergefr/sequencer-fail-with-not-one-upon-no-ff | Fabian Ruch | 2014-06-09 | 1 | -1/+1 |
| |/ / |
|
* | | | sequencer.c: check for lock failure and bail early in fast_forward_to | Ronnie Sahlberg | 2014-04-17 | 1 | -0/+4 |
|/ / |
|
* | | cherry-pick, revert: add the --gpg-sign option | Nicolas Vigier | 2014-01-27 | 1 | -0/+11 |
* | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-with | Christian Couder | 2013-12-05 | 1 | -4/+4 |
|/ |
|
* | refs: report ref type from lock_any_ref_for_update | Brad King | 2013-08-30 | 1 | -1/+2 |
* | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entry | Nguyễn Thái Ngọc Duy | 2013-07-09 | 1 | -3/+4 |
* | Merge branch 'rr/cherry-pick-fast-forward-reflog-message' | Junio C Hamano | 2013-06-27 | 1 | -3/+8 |
|\ |
|
| * | sequencer: write useful reflog message for fast-forward | Ramkumar Ramachandra | 2013-06-19 | 1 | -3/+8 |
* | | sequencer: avoid leaking message buffer when refusing to create an empty commit | Felipe Contreras | 2013-06-06 | 1 | -2/+4 |
* | | sequencer: remove useless indentation | Felipe Contreras | 2013-06-03 | 1 | -7/+9 |
|/ |
|
* | Merge branch 'mv/sequencer-pick-error-diag' | Junio C Hamano | 2013-05-09 | 1 | -3/+3 |
|\ |
|
| * | cherry-pick: picking a tag that resolves to a commit is OK | Junio C Hamano | 2013-05-09 | 1 | -3/+3 |
* | | Merge branch 'mv/sequencer-pick-error-diag' | Junio C Hamano | 2013-04-19 | 1 | -0/+18 |
|\ \
| |/ |
|
| * | cherry-pick: make sure all input objects are commits | Miklos Vajna | 2013-04-11 | 1 | -0/+18 |
* | | Sync with 'maint' | Junio C Hamano | 2013-04-12 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2013-04-12 | 1 | -1/+1 |
* | | Merge branch 'bc/append-signed-off-by' | Junio C Hamano | 2013-04-01 | 1 | -51/+141 |
|\ \
| |/
|/| |
|
| * | git-commit: populate the edit buffer with 2 blank lines before s-o-b | Brandon Casey | 2013-02-23 | 1 | -2/+25 |
| * | sequencer.c: teach append_signoff to avoid adding a duplicate newline | Brandon Casey | 2013-02-12 | 1 | -2/+13 |
| * | sequencer.c: teach append_signoff how to detect duplicate s-o-b | Brandon Casey | 2013-02-12 | 1 | -14/+45 |
| * | sequencer.c: always separate "(cherry picked from" from commit body | Brandon Casey | 2013-02-12 | 1 | -63/+65 |
| * | sequencer.c: require a conforming footer to be preceded by a blank line | Brandon Casey | 2013-02-12 | 1 | -1/+5 |
| * | sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer | Brandon Casey | 2013-02-12 | 1 | -14/+37 |
| * | commit, cherry-pick -s: remove broken support for multiline rfc2822 fields | Brandon Casey | 2013-02-12 | 1 | -6/+0 |
| * | sequencer.c: rework search for start of footer to improve clarity | Jonathan Nieder | 2013-02-12 | 1 | -4/+6 |
* | | learn to pick/revert into unborn branch | Martin von Zweigbergk | 2012-12-23 | 1 | -8/+12 |
|/ |
|