Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ps/build-sign-compare' | Junio C Hamano | 2024-12-23 | 1 | -0/+2 |
|\ | |||||
| * | global: mark code units that generate warnings with `-Wsign-compare` | Patrick Steinhardt | 2024-12-06 | 1 | -0/+2 |
* | | refs: drop strbuf_ prefix from helpers | Junio C Hamano | 2024-12-03 | 1 | -1/+1 |
|/ | |||||
* | checkout: refer to other-worktree branch, not ref | Kristoffer Haugsbakk | 2024-10-10 | 1 | -1/+1 |
* | Merge branch 'jc/pass-repo-to-builtins' | Junio C Hamano | 2024-09-23 | 1 | -3/+13 |
|\ | |||||
| * | builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h | John Cai | 2024-09-13 | 1 | -0/+1 |
| * | builtin: add a repository parameter for builtin functions | John Cai | 2024-09-13 | 1 | -3/+12 |
* | | environment: stop storing "core.logAllRefUpdates" globally | Patrick Steinhardt | 2024-09-12 | 1 | -0/+2 |
* | | refs: stop modifying global `log_all_ref_updates` variable | Patrick Steinhardt | 2024-09-12 | 1 | -1/+2 |
|/ | |||||
* | Merge branch 'ps/config-wo-the-repository' | Junio C Hamano | 2024-08-23 | 1 | -1/+1 |
|\ | |||||
| * | hooks: remove implicit dependency on `the_repository` | Patrick Steinhardt | 2024-08-13 | 1 | -1/+1 |
* | | Merge branch 'jc/refs-symref-referent' | Junio C Hamano | 2024-08-15 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | refs: add referent to each_ref_fn | John Cai | 2024-08-09 | 1 | -1/+1 |
* | | Merge branch 'jc/checkout-no-op-switch-errors' | Junio C Hamano | 2024-07-31 | 1 | -7/+14 |
|\ \ | |||||
| * | | checkout: special case error messages during noop switching | Junio C Hamano | 2024-07-02 | 1 | -7/+14 |
| * | | Merge branch 'en/header-cleanup' into maint-2.43 | Junio C Hamano | 2024-02-09 | 1 | -3/+0 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/orphan-unborn' into maint-2.43 | Junio C Hamano | 2024-02-09 | 1 | -1/+1 |
| |\ \ \ | |||||
* | | | | | merge-recursive: honor diff.algorithm | Antonin Delpeuch | 2024-07-14 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | checkout: clarify memory ownership in `unique_tracking_name()` | Patrick Steinhardt | 2024-05-27 | 1 | -6/+8 |
* | | | | Merge branch 'kn/ref-transaction-symref' | Junio C Hamano | 2024-05-20 | 1 | -2/+2 |
|\ \ \ \ | |||||
* \ \ \ \ | Merge branch 'ps/refs-without-the-repository' | Junio C Hamano | 2024-05-16 | 1 | -13/+22 |
|\ \ \ \ \ | |||||
| * | | | | | cocci: apply rules to rewrite callers of "refs" interfaces | Patrick Steinhardt | 2024-05-07 | 1 | -13/+22 |
* | | | | | | builtin: stop using `the_index` | Patrick Steinhardt | 2024-04-18 | 1 | -44/+43 |
|/ / / / / | |||||
* | | | | | Merge branch 'gt/add-u-commit-i-pathspec-check' | Junio C Hamano | 2024-04-15 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | revision: optionally record matches with pathspec elements | Junio C Hamano | 2024-04-03 | 1 | -1/+2 |
* | | | | | | Merge branch 'jc/checkout-detach-wo-tracking-report' | Junio C Hamano | 2024-04-12 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | checkout: omit "tracking" information on a detached HEAD | Junio C Hamano | 2024-03-31 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'pw/checkout-conflict-errorfix' | Junio C Hamano | 2024-04-01 | 1 | -22/+38 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | checkout: fix interaction between --conflict and --merge | Phillip Wood | 2024-03-14 | 1 | -3/+7 |
| * | | | | checkout: cleanup --conflict=<style> parsing | Phillip Wood | 2024-03-14 | 1 | -19/+32 |
| * | | | | merge-ll: introduce LL_MERGE_OPTIONS_INIT | Phillip Wood | 2024-03-14 | 1 | -2/+1 |
* | | | | | Merge branch 'eb/hash-transition' | Junio C Hamano | 2024-03-28 | 1 | -3/+5 |
|\ \ \ \ \ | |||||
| * | | | | | tree-walk: init_tree_desc take an oid to get the hash algorithm | Eric W. Biederman | 2023-10-02 | 1 | -3/+5 |
* | | | | | | Merge branch 'rj/restore-plug-leaks' | Junio C Hamano | 2024-03-26 | 1 | -30/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | checkout: plug some leaks in git-restore | Rubén Justo | 2024-03-14 | 1 | -30/+21 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'js/merge-tree-3-trees' | Junio C Hamano | 2024-03-08 | 1 | -3/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Always check `parse_tree*()`'s return value | Johannes Schindelin | 2024-02-23 | 1 | -3/+16 |
* | | | | | | | add-patch: classify '@' as a synonym for 'HEAD' | Ghanshyam Thakkar | 2024-02-13 | 1 | -1/+3 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch 'en/header-cleanup' | Junio C Hamano | 2024-01-08 | 1 | -3/+0 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | treewide: remove unnecessary includes in source files | Elijah Newren | 2023-12-26 | 1 | -3/+0 |
| |/ / / / | |||||
* | | | | | Merge branch 'jc/orphan-unborn' | Junio C Hamano | 2024-01-02 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | orphan/unborn: fix use of 'orphan' in end-user facing messages | Junio C Hamano | 2023-11-24 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'jc/checkout-B-branch-in-use' | Junio C Hamano | 2023-12-27 | 1 | -8/+29 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | checkout: forbid "-B <branch>" from touching a branch used elsewhere | Junio C Hamano | 2023-12-13 | 1 | -0/+7 |
| * | | | checkout: refactor die_if_checked_out() caller | Junio C Hamano | 2023-11-23 | 1 | -9/+23 |
| |/ / | |||||
* / / | config: handle NULL value when parsing non-bools | Jeff King | 2023-12-09 | 1 | -0/+2 |
|/ / | |||||
* | | Merge branch 'jc/unresolve-removal' | Junio C Hamano | 2023-10-02 | 1 | -4/+11 |
|\ \ | |/ |/| | |||||
| * | checkout: allow "checkout -m path" to unmerge removed paths | Junio C Hamano | 2023-08-01 | 1 | -4/+2 |
| * | checkout/restore: refuse unmerging paths unless checking out of the index | Junio C Hamano | 2023-08-01 | 1 | -0/+9 |
* | | Merge branch 'ah/advise-force-pushing' | Junio C Hamano | 2023-07-25 | 1 | -1/+1 |
|\ \ |