?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
New test case: Criss-cross merge
2005-12-03 Fredrik KuivinenNew test case: Criss-cross merge
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-12-03 Fredrik KuivinenNew test case: merge with directory/file conflicts
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-12-03 Fredrik Kuivinentest-lib.sh: Add new function, test_expect_code
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-12-03 Fredrik Kuivinengit-merge: Exit with code 2 if no strategy was able...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-11-20 Fredrik Kuivinenmerge-recursive: Replace 'except:'
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-11-12 Fredrik Kuivinenmerge-recursive: Use '~' instead of '_' to separate...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-11-12 Fredrik Kuivinenmerge-recursive: Add copyright notice
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-11-12 Fredrik Kuivinenmerge-recursive: Indent the output properly
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-11-09 Fredrik Kuivinenmerge-recursive: Fix support for branch names containing...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-11-09 Fredrik Kuivinenmerge-recursive: Fix limited output of rename messages
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-11-08 Fredrik Kuivinenmerge-recursive: Only print relevant rename messages
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-10-03 Fredrik Kuivinen[PATCH] Enable and fix support for base less merges.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-10-02 Fredrik Kuivinen[PATCH] Teach git-ls-files about '--' to denote end...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-10-02 Fredrik Kuivinen[PATCH] Teach the recursive merge strategy about renames.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-25 Fredrik Kuivinen[PATCH] More descriptive messages for conflict cases...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-25 Fredrik Kuivinen[PATCH] recursive-merge: Don't print a stack trace...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-13 Fredrik Kuivinen[PATCH] Use the 'die' function where it is appropriate.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-13 Fredrik Kuivinen[PATCH] Use a temporary index file when we merge the...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-13 Fredrik Kuivinen[PATCH] Adjust git-merge-recursive.py for the new tool...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-13 Fredrik Kuivinen[PATCH] Don't output 'Automatic merge failed, ...'
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-13 Fredrik Kuivinen[PATCH] Be more like the 'resolve' strategy.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-13 Fredrik Kuivinen[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-12 Fredrik Kuivinen[PATCH] Make the ProgramError class printable.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-12 Fredrik Kuivinen[PATCH] Make sure we die if we don't get enough arguments.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-12 Fredrik Kuivinen[PATCH] Introduce a 'die' function.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-12 Fredrik Kuivinen[PATCH] Exit with status code 2 if we get an exception.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-12 Fredrik Kuivinen[PATCH] Fix assertion failure when merging common ancestors.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
2005-09-04 Fredrik Kuivinen[PATCH] Make git-apply understand incomplete lines...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
 commit | commitdiff | tree
Gitweb development nest