Changes between Version 2 and Version 3 of GitCreateBundle
- Timestamp:
- Oct 15, 2013, 4:23:44 PM (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
GitCreateBundle
v2 v3 56 56 #!sh 57 57 $ git fetch origin 58 $# already up-to-date? otherwise pull new changes on both branches.58 # already up-to-date? otherwise pull new changes on both branches. 59 59 60 60 $ git branch … … 64 64 release_8.5 65 65 $ git merge feature_X --no-ff 66 $# In case of "Automatic merge failed; fix conflicts and then commit the result.", then see you later.66 # In case of "Automatic merge failed; fix conflicts and then commit the result.", then see you later. 67 67 68 $# Check:68 # Check: 69 69 $ git log --oneline -1 master 70 70 3f36d7f Merge branch 'feature_X' into master … … 122 122 123 123 124 $# Verify which HEADs will go into the bundle124 # Verify which HEADs will go into the bundle 125 125 $ git log master ^5ee465 --oneline 126 126 3f36d7f Merge branch 'ProvaMerge' into ProvaMergeMaster … … 128 128 79e8805 C 129 129 130 $# Create the bundle130 # Create the bundle 131 131 $ git bundle create ticket:XYZ_MergingFeature_xOnMaster.bundle master ^5ee465 132 132 Counting objects: 14, done. … … 136 136 Total 9 (delta 8), reused 0 (delta 0) 137 137 138 $# See inside it:138 # See inside it: 139 139 $ git list-heads ticket:XYZ_MergingFeature_xOnMaster.bundle 140 140 3f36d7f1a19c3e4cfeab66807dd39f6d7fda771b refs/heads/master … … 147 147 {{{ 148 148 #!sh 149 $# Create/init new empty repo149 # Create/init new empty repo 150 150 $ echo `pwd` 151 151 /home/rasdaman/rasdaman … … 154 154 $ git init 155 155 156 $# push two branches to the test repo156 # push two branches to the test repo 157 157 $ cd /home/rasdaman/rasdaman 158 158 $ git remote add test_remote ~/test_repo … … 160 160 $ git push test_remote feature_X 161 161 162 $# Now move to the test repo162 # Now move to the test repo 163 163 $ cd ~/test_repo 164 164 $ git branch … … 166 166 * master 167 167 168 $# check out on a branch you're not merging into:168 # check out on a branch you're not merging into: 169 169 $ git checkout feature_x 170 170 $ git branch
