| 2005-11-12 | merge-recursive: Use '~' instead of '_' to separate... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-11-12 | merge-recursive: Add copyright notice Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-11-12 | merge-recursive: Indent the output properly Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-11-09 | merge-recursive: Fix support for branch names containing... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-11-09 | merge-recursive: Fix limited output of rename messages Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-11-08 | merge-recursive: Only print relevant rename messages Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-10-03 | [PATCH] Enable and fix support for base less merges. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-10-02 | [PATCH] Teach git-ls-files about '--' to denote end... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-10-02 | [PATCH] Teach the recursive merge strategy about renames. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-25 | [PATCH] More descriptive messages for conflict cases... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-25 | [PATCH] recursive-merge: Don't print a stack trace... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-13 | [PATCH] Use the 'die' function where it is appropriate. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-13 | [PATCH] Use a temporary index file when we merge the... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-13 | [PATCH] Adjust git-merge-recursive.py for the new tool... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-13 | [PATCH] Don't output 'Automatic merge failed, ...' Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-13 | [PATCH] Be more like the 'resolve' strategy. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-13 | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-12 | [PATCH] Make the ProgramError class printable. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-12 | [PATCH] Make sure we die if we don't get enough arguments. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-12 | [PATCH] Introduce a 'die' function. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-12 | [PATCH] Exit with status code 2 if we get an exception. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-12 | [PATCH] Fix assertion failure when merging common ancestors. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |
| 2005-09-04 | [PATCH] Make git-apply understand incomplete lines... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> |
diff | tree |