| 2006-03-05 |
Fredrik Kuivinen | git-blame: Make the output human readable
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2006-03-02 |
Fredrik Kuivinen | git-blame, take 2
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2006-02-21 |
Fredrik Kuivinen | Add git-blame, a tool for assigning blame.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2006-02-14 |
Fredrik Kuivinen | s/SHELL/SHELL_PATH/ in Makefile
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2006-02-02 |
Fredrik Kuivinen | merge-recursive: Speed up commit graph construction
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2006-02-02 |
Fredrik Kuivinen | merge-recursive: Make use of provided bases
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2006-01-29 |
Fredrik Kuivinen | git-branch: Documentation fixes
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2006-01-29 |
Fredrik Kuivinen | merge-recursive: Improve the error message printed...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-16 |
Fredrik Kuivinen | git-whatchanged: Add usage string
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-16 |
Fredrik Kuivinen | git-log: Add usage string
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-16 |
Fredrik Kuivinen | git-diff: Usage string clean-up
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | git-repack: Usage string clean-up, emit usage at incorrect...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | git-rebase: Usage string clean-up, emit usage string...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | git-prune: Usage string clean-up, use the 'usage' function
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | git-lost-found: Usage string clean-up, emit usage string...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | git-fetch: Usage string clean-up, emit usage string...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | git-cherry: Usage string clean-up, use the 'usage'...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | git-applypatch: Usage string clean-up, emit usage string...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | git-am: Usage string clean-up
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | git-revert: Usage string clean-up
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | git-verify-tag: Usage string clean-up, emit usage string...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
freku045@student... | Trivial usage string clean-up
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-14 |
Fredrik Kuivinen | Usage message clean-up, take #2
|
commit | commitdiff | tree |
| 2005-12-03 |
Fredrik Kuivinen | New test case: Criss-cross merge
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-03 |
Fredrik Kuivinen | New test case: merge with directory/file conflicts
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-03 |
Fredrik Kuivinen | test-lib.sh: Add new function, test_expect_code
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-12-03 |
Fredrik Kuivinen | git-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 Kuivinen | merge-recursive: Replace 'except:'
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-11-12 |
Fredrik Kuivinen | merge-recursive: Use '~' instead of '_' to separate...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-11-12 |
Fredrik Kuivinen | merge-recursive: Add copyright notice
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-11-12 |
Fredrik Kuivinen | merge-recursive: Indent the output properly
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-11-09 |
Fredrik Kuivinen | merge-recursive: Fix support for branch names containing...
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-11-09 |
Fredrik Kuivinen | merge-recursive: Fix limited output of rename messages
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
|
commit | commitdiff | tree |
| 2005-11-08 |
Fredrik Kuivinen | merge-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 |
