description | test merge without recording it in history |
repository URL | git://mawercer.de/git-test-merge |
owner | pasky@ucw.cz |
last change | Thu, 25 Sep 2008 09:46:30 +0000 (25 11:46 +0200) |
last refresh | Sat, 31 Oct 2009 21:19:06 +0000 (31 22:19 +0100) |
mirror URL | git://repo.or.cz/git-test-merge.git |
| https://repo.or.cz/git-test-merge.git |
| ssh://git@repo.or.cz/git-test-merge.git |
bundle info | git-test-merge.git downloadable bundles |
content tags
|
|
readme
Hi at all,
I'd like to announce the exisntance of my small git test merge tool.
After reading
Linux kernel mailing list may remember that Linus complained about such
too frequent test merges when a subsystem maintainer asked to pull from
a branch full of "useless merges"
in the man page of git-rerere I had to start it..
$ git clone git://mawercer.de/git-test-merge
============= =======================================================
small HOWTO:
$ alias gtm=git-test-merge
$ gtm h # show the help
$ gtm s mytestmerge branch{1,2} # define testmerge "mytestmerge" which is formed by merging branch1 and
+branch2
$ gtm u mytestmerge # merge first using octopus, if it fails merge with
# the previous merge result with next branch until
# no branches are left to merge
If the merge fails you can resolve the conflicts and run
$ gtm c # you don't have to git-add the resolved files, will be done by the script
I hope its useful for you as well. If you have patches you may push them
instantly.
If it's obsolete because there is a better tool I appreciat you pointing
me to it
Sincerly
Marc Weber