| Age | Commit message (Expand) | Author |
|---|---|---|
| 2022-07-23 | merge: make restore_state() restore staged state too | Elijah Newren |
| 2022-07-23 | merge: fix save_state() to work when there are stat-dirty files | Elijah Newren |
| 2022-07-23 | merge: do not abort early if one strategy fails to handle the merge | Elijah Newren |
| 2022-07-23 | merge: abort if index does not match HEAD for trivial merges | Elijah Newren |
| 2022-07-23 | merge-resolve: abort if index does not match HEAD | Elijah Newren |
| 2022-05-19 | t6424: make sure a failed merge preserves local changes | Junio C Hamano |
| 2021-09-12 | tests: remove leftover untracked files | Elijah Newren |
| 2020-08-10 | Collect merge-related tests to t64xx | Elijah Newren |
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |