| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge: make restore_state() restore staged state too | Elijah Newren | 2022-07-23 | 1 | -1/+6 |
| * | merge: fix save_state() to work when there are stat-dirty files | Elijah Newren | 2022-07-23 | 1 | -0/+11 |
| * | merge: do not abort early if one strategy fails to handle the merge | Elijah Newren | 2022-07-23 | 1 | -0/+16 |
| * | merge: abort if index does not match HEAD for trivial merges | Elijah Newren | 2022-07-23 | 1 | -1/+21 |
| * | merge-resolve: abort if index does not match HEAD | Elijah Newren | 2022-07-23 | 1 | -0/+13 |
| * | t6424: make sure a failed merge preserves local changes | Junio C Hamano | 2022-05-19 | 1 | -2/+30 |
| * | tests: remove leftover untracked files | Elijah Newren | 2021-09-13 | 1 | -0/+1 |
| * | Collect merge-related tests to t64xx | Elijah Newren | 2020-08-11 | 1 | -0/+216 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |