Editing Git pull -a

Jump to navigation Jump to search

Warning: You are not logged in. Your IP address will be publicly visible if you make any edits. If you log in or create an account, your edits will be attributed to your username, along with other benefits.

The edit can be undone. Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.

Latest revision Your text
Line 27: Line 27:
 
  Already up to date.
 
  Already up to date.
  
=== [[There is no tracking information for the current branch.]] ===
+
== [[There is no tracking information for the current branch.]] ==
.../...
+
 
There is no tracking information for the current branch.
 
Please specify which branch you want to merge with.
 
See git-pull(1) for details.
 
 
    git pull <remote> <branch>
 
 
If you wish to set tracking information for this branch you can do so with:
 
 
    [[git branch --set-upstream-to]]=origin/<branch> your-current-branch
 
  
 
=== [[You are not currently on a branch.]] ===
 
=== [[You are not currently on a branch.]] ===
Line 46: Line 37:
 
   
 
   
 
     git pull <remote> <branch>
 
     git pull <remote> <branch>
 
=== fatal: Need to specify how to reconcile divergent branches. ===
 
hint: You have divergent branches and need to specify how to reconcile them.
 
hint: You can do so by running one of the following commands sometime before
 
hint: your next pull:
 
hint:
 
hint:  git config pull.rebase false  # merge
 
hint:  git config pull.rebase true  # rebase
 
hint:  git config pull.ff only      # fast-forward only
 
hint:
 
hint: You can replace "git config" with "git config --global" to set a default
 
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
 
hint: or --ff-only on the command line to override the configured default per
 
hint: invocation.
 
[[fatal: Need to specify how to reconcile divergent branches.]]
 
  
 
== Related ==
 
== Related ==

Please note that all contributions to wikieduonline may be edited, altered, or removed by other contributors. If you do not want your writing to be edited mercilessly, then do not submit it here.
You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource (see Wikieduonline:Copyrights for details). Do not submit copyrighted work without permission!

Cancel Editing help (opens in new window)

Templates used on this page:

Advertising: