Andrew's git - gitweb.git/history - git-merge-recursive.py

[gitweb.git] / git-merge-recursive.py

2006-04-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-04-05	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-03-31	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-03-26	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-02-22	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-02-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-02-02	merge-recursive: Make use of provided bases	blob \| diff \| raw
2006-01-30	Merge fixes up to GIT 1.1.6	blob \| diff \| raw \| diff to current
2006-01-30	GIT 1.1.6 v1.1.6	blob \| diff \| raw \| diff to current
2006-01-29	merge-recursive: Improve the error message printed...	blob \| diff \| raw \| diff to current
2006-01-27	GIT 1.1.5 v1.1.5	blob \| diff \| raw \| diff to current
2006-01-20	GIT 1.1.4 v1.1.4	blob \| diff \| raw \| diff to current
2006-01-16	GIT 1.1.3 v1.1.3	blob \| diff \| raw \| diff to current
2006-01-16	Merge branch 'fixo/1.0'	blob \| diff \| raw \| diff to current
2006-01-14	GIT 1.1.2 v1.1.2	blob \| diff \| raw \| diff to current
2006-01-11	GIT 1.1.1 v1.1.1	blob \| diff \| raw \| diff to current
2006-01-08	GIT 1.1.0 v1.1.0	blob \| diff \| raw \| diff to current
2006-01-06	Merge fixes up to GIT 1.0.7	blob \| diff \| raw \| diff to current
2005-12-28	Merge fixes up to GIT 1.0.6	blob \| diff \| raw \| diff to current
2005-12-27	Merge fixes up to GIT 1.0.5	blob \| diff \| raw \| diff to current
2005-12-24	Merge fixes up to GIT 1.0.4	blob \| diff \| raw \| diff to current
2005-12-23	Merge in fixes up to 1.0.3 maintenance branch.	blob \| diff \| raw \| diff to current
2005-12-22	Merge branch 'fixes'	blob \| diff \| raw \| diff to current
2005-12-22	merge-recursive: conflicting rename case.	blob \| diff \| raw \| diff to current
2005-12-12	GIT 0.99.9m aka 1.0rc5 v0.99.9m v1.0rc5	blob \| diff \| raw \| diff to current
2005-12-11	merge-recursive: cleanup setIndexStages	blob \| diff \| raw \| diff to current
2005-12-11	merge-recursive: leave unmerged entries in the index.	blob \| diff \| raw \| diff to current
2005-12-07	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-12-04	GIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4	blob \| diff \| raw \| diff to current
2005-12-02	merge-recursive: adjust git-ls-tree use for the latest.	blob \| diff \| raw \| diff to current
2005-11-30	Merge branch 'jc/subdir'	blob \| diff \| raw \| diff to current
2005-11-30	Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect...	blob \| diff \| raw \| diff to current
2005-11-30	merge-recursive: match the unmerged index entry behavio...	blob \| diff \| raw \| diff to current
2005-11-29	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-28	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-27	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-26	GIT 0.99.9k v0.99.9k	blob \| diff \| raw \| diff to current
2005-11-22	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-20	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-20	merge-recursive: Replace 'except:'	blob \| diff \| raw \| diff to current
2005-11-20	merge-recursive::removeFile: remove empty directories	blob \| diff \| raw \| diff to current
2005-11-19	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-17	GIT 0.99.9j aka 1.0rc3 v0.99.9j v1.0rc3	blob \| diff \| raw \| diff to current
2005-11-16	Give python a chance to find "backported" modules	blob \| diff \| raw \| diff to current
2005-11-12	GIT 0.99.9h v0.99.9h v1.0rc1	blob \| diff \| raw \| diff to current
2005-11-12	merge-recursive: Use '~' instead of '_' to separate...	blob \| diff \| raw \| diff to current
2005-11-12	merge-recursive: Add copyright notice	blob \| diff \| raw \| diff to current
2005-11-12	merge-recursive: Indent the output properly	blob \| diff \| raw \| diff to current
2005-11-10	GIT 0.99.9g v0.99.9g	blob \| diff \| raw \| diff to current
2005-11-10	Merge branch 'hold/svn'	blob \| diff \| raw \| diff to current
2005-11-10	Merge branch 'hold/rpm'	blob \| diff \| raw \| diff to current
2005-11-09	merge-recursive: Fix support for branch names containin...	blob \| diff \| raw \| diff to current
2005-11-09	merge-recursive: Fix limited output of rename messages	blob \| diff \| raw \| diff to current
2005-11-08	Merge branch 'master'	blob \| diff \| raw \| diff to current
2005-11-08	merge-recursive: Only print relevant rename messages	blob \| diff \| raw \| diff to current
2005-11-07	GIT 0.99.9e v0.99.9e	blob \| diff \| raw \| diff to current
2005-10-31	GIT 0.99.9a v0.99.9a	blob \| diff \| raw \| diff to current
2005-10-27	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-10-23	Merge branch 'fixes'	blob \| diff \| raw \| diff to current
2005-10-21	Merge branch 'fixes'	blob \| diff \| raw \| diff to current
2005-10-18	Merge branch 'fixes'	blob \| diff \| raw \| diff to current
2005-10-16	Merge branch 'fixes'	blob \| diff \| raw \| diff to current
2005-10-16	Merge branch 'svn' of netz.smurf.noris.de/git/git	blob \| diff \| raw \| diff to current
2005-10-15	Merge branch 'fixes'	blob \| diff \| raw \| diff to current
2005-10-12	Merge branch 'fixes'	blob \| diff \| raw \| diff to current
2005-10-10	Merge branch 'fixes'	blob \| diff \| raw \| diff to current
2005-10-10	Deal with $(bindir) and friends with whitespaces.	blob \| diff \| raw \| diff to current
2005-10-03	Merge with master.kernel.org:/pub/scm/git/git.git	blob \| diff \| raw \| diff to current
2005-10-02	[PATCH] Teach the recursive merge strategy about renames.	blob \| diff \| raw \| diff to current
2005-09-27	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-09-25	[PATCH] recursive-merge: Don't print a stack trace...	blob \| diff \| raw \| diff to current
2005-09-14	Merge branch 'master' of .	blob \| diff \| raw \| diff to current
2005-09-14	git-merge-recursive: Trivial RE fixes.	blob \| diff \| raw \| diff to current
2005-09-13	[PATCH] Use a temporary index file when we merge the...	blob \| diff \| raw \| diff to current
2005-09-13	[PATCH] Adjust git-merge-recursive.py for the new tool...	blob \| diff \| raw \| diff to current
2005-09-13	[PATCH] Don't output 'Automatic merge failed, ...'	blob \| diff \| raw \| diff to current
2005-09-13	[PATCH] Be more like the 'resolve' strategy.	blob \| diff \| raw \| diff to current
2005-09-13	[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.	blob \| diff \| raw \| diff to current