| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add missing includes and forward declarations | Elijah Newren | 2018-08-15 | 1 | -0/+2 |
| * | resolve-undo: convert struct resolve_undo_info to object_id | brian m. carlson | 2018-03-14 | 1 | -1/+1 |
| * | convert unmerge_cache to take struct pathspec | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -1/+1 |
| * | checkout: avoid unnecessary match_pathspec calls | Nguyễn Thái Ngọc Duy | 2013-03-27 | 1 | -0/+1 |
| * | build: make code "-Wpointer-arith" clean | Junio C Hamano | 2010-02-01 | 1 | -1/+1 |
| * | resolve-undo: "checkout -m path" uses resolve-undo information | Junio C Hamano | 2009-12-25 | 1 | -0/+2 |
| * | resolve-undo: record resolved conflicts in a new index extension section | Junio C Hamano | 2009-12-25 | 1 | -0/+14 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/resolve-undo.h