Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/the-index' | Junio C Hamano | 2019-01-04 | 1 | -1/+1 |
|\ | |||||
| * | sequencer.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-11-12 | 1 | -1/+1 |
* | | Merge branch 'nd/i18n' | Junio C Hamano | 2019-01-04 | 1 | -2/+2 |
|\ \ | |||||
| * | | parse-options: replace opterror() with optname() | Nguyễn Thái Ngọc Duy | 2018-11-12 | 1 | -1/+1 |
| * | | alias.c: mark split_cmdline_strerror() strings for translation | Nguyễn Thái Ngọc Duy | 2018-11-12 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'jk/verify-sig-merge-into-void' | Junio C Hamano | 2018-11-18 | 1 | -25/+5 |
|\ \ | |||||
| * | | merge: handle --verify-signatures for unborn branch | Jeff King | 2018-11-07 | 1 | -0/+4 |
| * | | merge: extract verify_merge_signature() helper | Jeff King | 2018-11-07 | 1 | -25/+1 |
* | | | assert NOARG/NONEG behavior of parse-options callbacks | Jeff King | 2018-11-06 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Merge branch 'nd/the-index' | Junio C Hamano | 2018-10-19 | 1 | -7/+9 |
|\ \ | |||||
| * | | revision.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -2/+2 |
| * | | rerere.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -1/+1 |
| * | | merge.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -3/+5 |
| * | | diff.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'jk/cocci' | Junio C Hamano | 2018-09-17 | 1 | -3/+3 |
|\ \ | |||||
| * | | convert "oidcmp() != 0" to "!oideq()" | Jeff King | 2018-08-29 | 1 | -1/+1 |
| * | | convert "oidcmp() == 0" to oideq() | Jeff King | 2018-08-29 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'ds/reachable' | Junio C Hamano | 2018-09-17 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | commit.h: remove method declarations | Derrick Stolee | 2018-07-21 | 1 | -0/+1 |
| * | Merge branch 'sb/object-store-grafts' into sb/object-store-lookup | Junio C Hamano | 2018-06-29 | 1 | -18/+19 |
| |\ | |||||
* | \ | Merge branch 'nd/i18n' | Junio C Hamano | 2018-08-16 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update messages in preparation for i18n | Nguyễn Thái Ngọc Duy | 2018-07-23 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'js/rebase-merge-octopus' | Junio C Hamano | 2018-08-03 | 1 | -0/+32 |
|\ \ \ | |||||
| * | | | merge: allow reading the merge commit message from a file | Johannes Schindelin | 2018-07-11 | 1 | -0/+32 |
| |/ / | |||||
* | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-08-03 | 1 | -5/+6 |
|\ \ \ | |||||
| * | | | builtin/merge: switch to use the_hash_algo | brian m. carlson | 2018-07-16 | 1 | -5/+6 |
| |/ / | |||||
* | | | Merge branch 'sb/object-store-grafts' | Junio C Hamano | 2018-07-18 | 1 | -18/+19 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | path.c: migrate global git_path_* to take a repository argument | Stefan Beller | 2018-05-18 | 1 | -18/+19 |
* | | 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-17 | 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 index | Martin Ågren | 2018-03-01 | 1 | -9/+6 |
| | |/ / | |/| | |