GIT 1.0.0
[gitweb.git] / git-merge-recursive.py
2005-12-12 GIT 0.99.9m aka 1.0rc5 v0.99.9mv1.0rc5
2005-12-11 merge-recursive: cleanup setIndexStages
2005-12-11 merge-recursive: leave unmerged entries in the index.
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-04 GIT 0.99.9l aka 1.0rc4 v0.99.9lv1.0rc4
2005-12-02 merge-recursive: adjust git-ls-tree use for the latest.
2005-11-30 Merge branch 'jc/subdir'
2005-11-30 Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect...
2005-11-30 merge-recursive: match the unmerged index entry behavio...
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-26 GIT 0.99.9k v0.99.9k
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 merge-recursive: Replace 'except:'
2005-11-20 merge-recursive::removeFile: remove empty directories
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-17 GIT 0.99.9j aka 1.0rc3 v0.99.9jv1.0rc3
2005-11-16 Give python a chance to find "backported" modules
2005-11-12 GIT 0.99.9h v0.99.9hv1.0rc1
2005-11-12 merge-recursive: Use '~' instead of '_' to separate...
2005-11-12 merge-recursive: Add copyright notice
2005-11-12 merge-recursive: Indent the output properly
2005-11-10 GIT 0.99.9g v0.99.9g
2005-11-10 Merge branch 'hold/svn'
2005-11-10 Merge branch 'hold/rpm'
2005-11-09 merge-recursive: Fix support for branch names containin...
2005-11-09 merge-recursive: Fix limited output of rename messages
2005-11-08 Merge branch 'master'
2005-11-08 merge-recursive: Only print relevant rename messages
2005-11-07 GIT 0.99.9e v0.99.9e
2005-10-31 GIT 0.99.9a v0.99.9a
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-23 Merge branch 'fixes'
2005-10-21 Merge branch 'fixes'
2005-10-18 Merge branch 'fixes'
2005-10-16 Merge branch 'fixes'
2005-10-16 Merge branch 'svn' of netz.smurf.noris.de/git/git
2005-10-15 Merge branch 'fixes'
2005-10-12 Merge branch 'fixes'
2005-10-10 Merge branch 'fixes'
2005-10-10 Deal with $(bindir) and friends with whitespaces.
2005-10-03 Merge with master.kernel.org:/pub/scm/git/git.git
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'.