Branch A has commits (X,Y) that also need to be in Branch B. The cherry-pick operations should be done in the same chronological order that the commits appear in Branch A.
cherry-pick does support a range of commits, but if you have merge commits in that range, it gets really complicated
git checkout branch-B
git cherry-pick X
git cherry-pick Y
| 0-mail.com | |
| 0815.ru | |
| 0clickemail.com | |
| 0wnd.net | |
| 0wnd.org | |
| 10minutemail.com | |
| 20minutemail.com | |
| 2prong.com | |
| 30minutemail.com | |
| 3d-painting.com |
| #!/bin/bash | |
| # Functions ============================================== | |
| # return 1 if global command line program installed, else 0 | |
| # example | |
| # echo "node: $(program_is_installed node)" | |
| function program_is_installed { | |
| # set to 1 initially | |
| local return_=1 |
| # -*- mode: ruby -*- | |
| # vi: set ft=ruby : | |
| # All Vagrant configuration is done below. The "2" in Vagrant.configure | |
| # configures the configuration version (we support older styles for | |
| # backwards compatibility). Please don't change it unless you know what | |
| # you're doing. | |
| Vagrant.configure(2) do |config| | |
| # The most common configuration options are documented and commented below. | |
| # For a complete reference, please see the online documentation at |
Follow the steps below to setup a local development environment:
Recommended to download latest XQuartz
| <VirtualHost *:80> | |
| ServerName redesign.americanidol.com | |
| DocumentRoot /Users/RBrennan/fox/fox-idol-redesign/idol/americanidol | |
| SetEnv APPLICATION_ENV "development" | |
| <Directory /Users/RBrennan/fox/fox-idol-redesign/idol/americanidol> | |
| Options All | |
| AllowOverride All | |
| Order Allow,Deny | |
| Allow from all | |
| DirectoryIndex index.htm index.html index.php |