mergeq 0.0.111 → 0.0.1111
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/bin/mergeq.sh +3 -2
- data/lib/mergeq/version.rb +1 -1
- metadata +1 -1
data/bin/mergeq.sh
CHANGED
|
@@ -96,9 +96,10 @@ function push_to_merge_branch {
|
|
|
96
96
|
status "Merging into $merge_branch"
|
|
97
97
|
git fetch origin $merge_branch
|
|
98
98
|
git checkout -q FETCH_HEAD
|
|
99
|
-
git merge --no-ff
|
|
99
|
+
git merge --no-ff --no-commit $current
|
|
100
|
+
git checkout $current -- .
|
|
100
101
|
echo $current > .merge
|
|
101
|
-
git add .
|
|
102
|
+
git add .
|
|
102
103
|
git commit -m "Queuing merge: $branch into $target_branch"
|
|
103
104
|
status "Queuing merge by pushing $merge_branch"
|
|
104
105
|
git push origin HEAD:refs/heads/$merge_branch || push_failed
|
data/lib/mergeq/version.rb
CHANGED