| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | 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