Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ds/commit-graph-lockfile-fix' | Junio C Hamano | 2018-06-25 | 1 | -3/+4 |
|\ | |||||
| * | merge: check config before loading commits | Derrick Stolee | 2018-05-22 | 1 | -3/+4 |
| * | Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees | Junio C Hamano | 2018-04-11 | 1 | -1/+1 |
| |\ | |||||
* | \ | Merge branch 'nd/commit-util-to-slab' | Junio C Hamano | 2018-06-25 | 1 | -12/+13 |
|\ \ \ | |||||
| * | | | merge: use commit-slab in merge remote desc instead of commit->util | Nguyễn Thái Ngọc Duy | 2018-05-21 | 1 | -12/+13 |
* | | | | Merge branch 'nd/use-opt-int-set-f' | Junio C Hamano | 2018-06-01 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Use OPT_SET_INT_F() for cmdline option specification | Nguyễn Thái Ngọc Duy | 2018-05-24 | 1 | -3/+3 |
| |/ / / | |||||
* | | | | Merge branch 'nd/command-list' | Junio C Hamano | 2018-06-01 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Move declaration for alias.c to alias.h | Nguyễn Thái Ngọc Duy | 2018-05-21 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge branch 'bw/ref-prefix-for-configured-refspec' | Junio C Hamano | 2018-05-30 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | refspec: move refspec parsing logic into its own file | Brandon Williams | 2018-05-18 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-05-30 | 1 | -7/+7 |
|\ \ \ \ | |||||
| * | | | | builtin/merge: switch tree functions to use object_id | brian m. carlson | 2018-05-02 | 1 | -7/+7 |
| |/ / / | |||||
* | | | | Merge branch 'ma/lockfile-cleanup' | Junio C Hamano | 2018-05-30 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | lock_file: make function-local locks non-static | Martin Ågren | 2018-05-10 | 1 | -2/+2 |
* | | | | Merge branch 'sb/object-store' | Junio C Hamano | 2018-04-11 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | object-store: close all packs upon clearing the object store | Stefan Beller | 2018-03-26 | 1 | -1/+1 |
* | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-04-10 | 1 | -4/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Convert find_unique_abbrev* to struct object_id | brian m. carlson | 2018-03-14 | 1 | -3/+3 |
| * | | | | cache-tree: convert write_*_as_tree to object_id | brian m. carlson | 2018-03-14 | 1 | -1/+1 |
* | | | | | Merge branch 'ma/skip-writing-unchanged-index' | Junio C Hamano | 2018-03-21 | 1 | -9/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-index | Martin Ågren | 2018-03-01 | 1 | -9/+6 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'bw/c-plus-plus' | Junio C Hamano | 2018-03-06 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | object: rename function 'typename' to 'type_name' | Brandon Williams | 2018-02-14 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'jc/allow-ff-merging-kept-tags' | Junio C Hamano | 2018-03-06 | 1 | -4/+39 |
|\ \ \ | |_|/ |/| | | |||||
| * | | merge: allow fast-forward when merging a tracked tagjc/allow-ff-merging-kept-tags | Junio C Hamano | 2018-02-16 | 1 | -4/+39 |
| |/ | |||||
* | | commit: convert commit_tree* to object_id | Patryk Obara | 2018-01-30 | 1 | -4/+4 |
|/ | |||||
* | merge: add config option for verifySignatures | Hans Jerry Illikainen | 2017-12-12 | 1 | -0/+2 |
* | Merge branch 'ma/reduce-heads-leakfix' | Junio C Hamano | 2017-11-15 | 1 | -0/+1 |
|\ | |||||
| * | reduce_heads: fix memory leaksma/reduce-heads-leakfix | Martin Ågren | 2017-11-08 | 1 | -0/+1 |
* | | refs: convert dwim_ref and expand_ref to struct object_id | brian m. carlson | 2017-10-16 | 1 | -1/+1 |
* | | refs: convert resolve_refdup and refs_resolve_refdup to struct object_id | brian m. carlson | 2017-10-16 | 1 | -1/+1 |
* | | refs: convert update_ref and refs_update_ref to use struct object_id | brian m. carlson | 2017-10-16 | 1 | -7/+6 |
|/ | |||||
* | Merge branch 'rs/strbuf-leakfix' | Junio C Hamano | 2017-09-19 | 1 | -2/+7 |
|\ | |||||
| * | merge: release strbuf after use in write_merge_heads() | Rene Scharfe | 2017-09-07 | 1 | -0/+1 |
| * | merge: release strbuf after use in save_state() | Rene Scharfe | 2017-09-07 | 1 | -2/+6 |
* | | Merge branch 'sb/merge-commit-msg-hook' | Junio C Hamano | 2017-09-19 | 1 | -0/+8 |
|\ \ | |||||
| * | | builtin/merge: honor commit-msg hook for merges | Stefan Beller | 2017-09-08 | 1 | -0/+8 |
| |/ | |||||
* | | Merge branch 'ma/up-to-date' | Junio C Hamano | 2017-09-10 | 1 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | treewide: correct several "up-to-date" to "up to date"ma/up-to-date | Martin Ågren | 2017-08-23 | 1 | -2/+2 |
* | | Merge branch 'mg/killed-merge' | Junio C Hamano | 2017-08-26 | 1 | -3/+12 |
|\ \ | |||||
| * | | merge: save merge state earliermg/killed-merge | Michael J Gruber | 2017-08-23 | 1 | -0/+2 |
| * | | merge: split write_merge_state in two | Michael J Gruber | 2017-08-23 | 1 | -3/+8 |
| * | | merge: clarify call chain | Michael J Gruber | 2017-08-23 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch 'jt/packmigrate' | Junio C Hamano | 2017-08-26 | 1 | -0/+1 |
|\ \ | |||||
| * | | pack: move pack-closing functions | Jonathan Tan | 2017-08-23 | 1 | -0/+1 |
* | | | Merge branch 'lg/merge-signoff' | Junio C Hamano | 2017-08-24 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | merge: add a --signoff flaglg/merge-signoff | Łukasz Gryglicki | 2017-07-25 | 1 | -0/+4 |
| |/ | |||||
* | | Merge branch 'rs/merge-microcleanup' | Junio C Hamano | 2017-08-22 | 1 | -2/+2 |
|\ \ | |||||
| * | | merge: use skip_prefix()rs/merge-microcleanup | René Scharfe | 2017-08-10 | 1 | -2/+2 |