Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Accessmod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
geohealth
Accessmod
Commits
c5cfa062
Commit
c5cfa062
authored
9 years ago
by
fxi
Browse files
Options
Downloads
Patches
Plain Diff
set update relative to current branch
parent
3d14be29
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
sh/update.sh
+4
-3
4 additions, 3 deletions
sh/update.sh
with
4 additions
and
3 deletions
sh/update.sh
+
4
−
3
View file @
c5cfa062
...
...
@@ -33,15 +33,16 @@ then
git config
--global
user.email
$email
fi
# get current branch
currentBranch
=
$(
git branch |
grep
'*'
|awk
'{ print $2}'
)
# fetch changes, git stores them in FETCH_HEAD
git fetch
git fetch
origin
$currentBranch
# check for remote changes in origin repository
newUpdatesAvailable
=
`
git diff HEAD FETCH_HEAD
`
if
[
"
$newUpdatesAvailable
"
!=
""
]
then
# get current branch
currentBranch
=
$(
git branch |
grep
'*'
|awk
'{ print $2}'
)
# create the fallback
git checkout
-B
fallbacks
...
...
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