| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | t: remove TEST_PASSES_SANITIZE_LEAK annotations | Patrick Steinhardt | 2024-11-21 | 1 | -1/+0 |
| * | builtin/merge: fix leaking `struct cmdnames` in `get_strategy()` | Patrick Steinhardt | 2024-06-11 | 1 | -0/+1 |
| * | t7[5-9]*: adjust the references to the default branch name "main" | Johannes Schindelin | 2020-11-20 | 1 | -1/+1 |
| * | t7606: Avoid using head as a file name | Brian Gernhardt | 2010-08-24 | 1 | -4/+4 |
| * | merge: let custom strategies intervene in trivial merges | Jonathan Nieder | 2010-08-16 | 1 | -3/+33 |
| * | t7606 (merge-theirs): modernize style | Jonathan Nieder | 2010-08-16 | 1 | -26/+40 |
| * | tests: use "git foo" without dash in strings | Nanako Shiraishi | 2008-09-10 | 1 | -1/+1 |
| * | t7606: fix custom merge test | Junio C Hamano | 2008-08-24 | 1 | -2/+5 |
| * | Add a new test for using a custom merge strategy | Miklos Vajna | 2008-07-30 | 1 | -0/+46 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |