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