Author: vborja
Date: Thu May 8 06:46:03 2008
New Revision: 654522
URL: http://svn.apache.org/viewvc?rev=654522&view=rev
Log:
Added alias for git rebase, and use it intead of git merge for synch.
Modified:
incubator/buildr/trunk/doc/scripts/buildr-git.rb (contents, props changed)
Modified: incubator/buildr/trunk/doc/scripts/buildr-git.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/scripts/buildr-git.rb?rev=654522&r1=654521&r2=654522&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/scripts/buildr-git.rb (original)
+++ incubator/buildr/trunk/doc/scripts/buildr-git.rb Thu May 8 06:46:03 2008
@@ -393,10 +393,11 @@
# Create github origin aliases
`git config alias.get "!git apache-fetch && git fetch origin"`
`git config alias.mrg "!git apache-merge && git merge origin"`
+ `git config alias.rbs "!git rebase --onto #{svn_branch} origin/master
master"`
`git config alias.put "!git apache-push && git push origin"`
# This is Victor's cronjob
- `git config alias.synchronize "!git get && git mrg && git put"`
+ `git config alias.synchronize "!git get && git rbs && git put"`
# Final notices.
puts <<-NOTICE + notice
Propchange: incubator/buildr/trunk/doc/scripts/buildr-git.rb
------------------------------------------------------------------------------
svn:executable = *
