Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
chaosframework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
chaos-lnf-control
chaosframework
Commits
cb09b652
Commit
cb09b652
authored
5 years ago
by
Andrea Michelotti
Browse files
Options
Downloads
Patches
Plain Diff
added few commands to come back to origin branch
parent
459eb565
No related branches found
Branches containing commit
Tags
june-2019
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/chaos_git.sh
+11
-0
11 additions, 0 deletions
tools/chaos_git.sh
with
11 additions
and
0 deletions
tools/chaos_git.sh
+
11
−
0
View file @
cb09b652
...
@@ -268,6 +268,17 @@ for dir in ${on_dir[@]}; do
...
@@ -268,6 +268,17 @@ for dir in ${on_dir[@]}; do
else
else
error_mesg
"[
$dir
] error merging
$1
->
$2
, skipping merge"
error_mesg
"[
$dir
] error merging
$1
->
$2
, skipping merge"
fi
fi
if
git push origin
$2
;
then
info_mesg
"[
$dir
] push origin
$2
"
"done"
else
error_mesg
"[
$dir
] error pushing
$2
-> origin, skipping merge"
fi
if
git checkout
$1
;
then
info_mesg
"[
$dir
] back into branch
$1
"
"done"
else
error_mesg
"[
$dir
] error back into branch
$1
, skipping merge"
fi
fi
fi
fi
fi
;;
;;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment