Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t: remove TEST_PASSES_SANITIZE_LEAK annotations | Patrick Steinhardt | 2024-11-21 | 1 | -1/+0 |
* | config: fix leaking "core.notesref" variable | Patrick Steinhardt | 2024-06-11 | 1 | -0/+1 |
* | config tests: cover blind spots in git_die_config() tests | Ævar Arnfjörð Bjarmason | 2023-03-28 | 1 | -1/+6 |
* | t3309: make test work with SHA-256 | brian m. carlson | 2020-02-07 | 1 | -84/+144 |
* | notes: teach git-notes about notes.<name>.mergeStrategy option | Jacob Keller | 2015-08-18 | 1 | -0/+39 |
* | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-18 | 1 | -0/+40 |
* | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 2010-11-17 | 1 | -0/+145 |
* | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 2010-11-17 | 1 | -0/+502 |