teach git-status about spaces in filenames
[gitweb.git] / git-merge-recursive.py
2005-10-02 [PATCH] Teach the recursive merge strategy about renames.
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-25 [PATCH] recursive-merge: Don't print a stack trace...
2005-09-14 Merge branch 'master' of .
2005-09-14 git-merge-recursive: Trivial RE fixes.
2005-09-13 [PATCH] Use a temporary index file when we merge the...
2005-09-13 [PATCH] Adjust git-merge-recursive.py for the new tool...
2005-09-13 [PATCH] Don't output 'Automatic merge failed, ...'
2005-09-13 [PATCH] Be more like the 'resolve' strategy.
2005-09-13 [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.