| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'va/i18n-even-more' | Junio C Hamano | 2016-07-13 | 1 | -5/+10 |
|\ |
|
| * | i18n: sequencer: add period to error message | Vasco Almeida | 2016-06-17 | 1 | -1/+1 |
| * | i18n: sequencer: mark string for translation | Vasco Almeida | 2016-06-17 | 1 | -1/+1 |
| * | i18n: sequencer: mark entire sentences for translation | Vasco Almeida | 2016-06-17 | 1 | -3/+8 |
* | | Merge branch 'js/find-commit-subject-ignore-leading-blanks' | Junio C Hamano | 2016-07-11 | 1 | -4/+2 |
|\ \ |
|
| * | | sequencer: use skip_blank_lines() to find the commit subject | Johannes Schindelin | 2016-06-29 | 1 | -4/+2 |
* | | | Merge branch 'mg/cherry-pick-multi-on-unborn' | Junio C Hamano | 2016-06-27 | 1 | -5/+6 |
|\ \ \
| |_|/
|/| | |
|
| * | | cherry-pick: allow to pick to unborn branchesmg/cherry-pick-multi-on-unborn | Michael J Gruber | 2016-06-06 | 1 | -5/+6 |
| |/ |
|
* | | sequencer.c: use error_errno() | Nguyễn Thái Ngọc Duy | 2016-05-09 | 1 | -2/+1 |
* | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-02-26 | 1 | -19/+10 |
|\ \ |
|
| * | | sequencer: simplify memory allocation of get_message | Jeff King | 2016-02-22 | 1 | -19/+10 |
* | | | strbuf: introduce strbuf_getline_{lf,nul}() | Junio C Hamano | 2016-01-15 | 1 | -1/+1 |
|/ / |
|
* | | Remove get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -9/+9 |
* | | Convert struct object to object_id | brian m. carlson | 2015-11-20 | 1 | -11/+11 |
* | | Add several uses of get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -9/+9 |
* | | Merge branch 'dt/refs-pseudo' | Junio C Hamano | 2015-08-25 | 1 | -19/+4 |
|\ \ |
|
| * | | sequencer: replace write_cherry_pick_head with update_ref | David Turner | 2015-07-31 | 1 | -19/+4 |
| |/ |
|
* | | memoize common git-path "constant" filesjk/git-path | Jeff King | 2015-08-10 | 1 | -47/+40 |
|/ |
|
* | 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 |