| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-09-09 |
| |\ | |||
| | * | convert unmerge_cache to take struct pathspec | Nguyễn Thái Ngọc Duy | 2013-07-15 |
| * | | Convert "struct cache_entry *" to "const ..." wherever possible | Nguyễn Thái Ngọc Duy | 2013-07-09 |
| |/ | |||
| * | checkout: avoid unnecessary match_pathspec calls | Nguyễn Thái Ngọc Duy | 2013-03-27 |
| * | Convert the users of for_each_string_list to for_each_string_list_item macro | Alex Riesen | 2010-07-05 |
| * | string_list: Fix argument order for string_list_lookup | Julian Phillips | 2010-06-27 |
| * | string_list: Fix argument order for string_list_insert | Julian Phillips | 2010-06-27 |
| * | string_list: Fix argument order for for_each_string_list | Julian Phillips | 2010-06-27 |
| * | build: make code "-Wpointer-arith" clean | Junio C Hamano | 2010-02-01 |
| * | resolve-undo: "checkout -m path" uses resolve-undo information | Junio C Hamano | 2009-12-25 |
| * | resolve-undo: record resolved conflicts in a new index extension section | Junio C Hamano | 2009-12-25 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/resolve-undo.c