vic / buildr fork watch download tarball
public
Rubygem
Description: Apache Buildr
Homepage: http://incubator.apache.org/buildr
Clone URL: git://github.com/vic/buildr.git
Search Repo: 
Added alias for git rebase, and use it intead of git merge for synch.


git-svn-id: https://svn.apache.org/repos/asf/incubator/buildr/trunk@654522 
13f79535-47bb-0310-9956-ffa450edef68
vic (author)
Thu May 08 06:46:03 -0700 2008
commit  f2724d8a120b35aca67bb286cf7aefaa0f74529a
tree    05f82dae9e9080cd3cba81df81ecfebc508cc961
parent  a97453f8f34cff911a4baf5955664afe76d3b21a
0
doc/scripts/buildr-git.rb 
...
393
394
395
 
396
397
398
399
 
400
401
402
 
...
393
394
395
396
397
398
399
 
400
401
402
403
 
0
@@ -393,10 +393,11 @@
0
     # Create github origin aliases
0
     `git config alias.get "!git apache-fetch && git fetch origin"`
0
     `git config alias.mrg "!git apache-merge && git merge origin"`
0
+    `git config alias.rbs "!git rebase --onto #{svn_branch} origin/master master"`
0
     `git config alias.put "!git apache-push && git push origin"`
0
     
0
     # This is Victor's cronjob
0
-    `git config alias.synchronize "!git get && git mrg && git put"`
0
+    `git config alias.synchronize "!git get && git rbs && git put"`
0
     
0
     # Final notices.
0
     puts <<-NOTICE + notice

Comments

    No one has commented yet.