Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
hg-git
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
Terraform modules
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
This instance will be upgraded to Heptapod 17.9.2 on 2025-04-24 between 17:00 and 18:00 UTC+2
Show more breadcrumbs
mercurial
hg-git
Commits
ef70bb59
Commit
ef70bb59
authored
3 years ago
by
Dan Villiom Podlaski Christiansen
Browse files
Options
Downloads
Plain Diff
merge 0.10.x branch into default
parents
95eabda0
9b79986b
Loading
Loading
No related merge requests found
Pipeline
#23067
passed
3 years ago
Stage: current
Stage: compat
Stage: upcoming
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test-pull-after-rebase.t
+1
-1
1 addition, 1 deletion
tests/test-pull-after-rebase.t
with
1 addition
and
1 deletion
tests/test-pull-after-rebase.t
+
1
−
1
View file @
ef70bb59
...
...
@@ -73,7 +73,7 @@
$
git
add
delta
$
fn_git_commit
-
m 'add gamma'
$
git
push
--
quiet
--
set
-
upstream
origin
otherbranch
Branch
'
otherbranch
'
set
up
to
track
remote
branch
'
otherbranch
'
from
'
origin
'
.
Branch
'
otherbranch
'
set
up
to
track
remote
branch
'
otherbranch
'
from
'
origin
'
.
(?)
$
cd
..
Pull
that
...
...
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