Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vcsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Kevin Lyda
vcsh
Commits
cb24803b
Commit
cb24803b
authored
11 years ago
by
Thomas Ferris Nicolaisen
Browse files
Options
Downloads
Patches
Plain Diff
Suggest shorter form of vcsh pull
parent
59590153
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
vcsh
+1
-1
1 addition, 1 deletion
vcsh
with
1 addition
and
1 deletion
vcsh
+
1
−
1
View file @
cb24803b
...
...
@@ -161,7 +161,7 @@ clone() {
done
[
"
$VCSH_CONFLICT
"
=
'1'
])
&&
fatal
"will stop after fetching and not try to merge!
Once this situation has been resolved, run 'vcsh
run
$VCSH_REPO_NAME
git
pull' to finish cloning."
17
Once this situation has been resolved, run 'vcsh
$VCSH_REPO_NAME
pull' to finish cloning."
17
git merge origin/master
hook post-merge
hook post-clone
...
...
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