Difference between revisions of "Git pull"

From wikieduonline
Jump to navigation Jump to search
Line 40: Line 40:
 
* <code>[[git fetch]]</code>
 
* <code>[[git fetch]]</code>
 
* <code>[[git clone]]</code>
 
* <code>[[git clone]]</code>
* <code>[[git config]] --global pull.ff only</code>
 
 
* <code>[[git push]]</code>
 
* <code>[[git push]]</code>
 +
* <code>[[git config]] [[pull]].[[rebase]] false </code>  # merge (the default strategy)
 +
* <code>git config pull.rebase true </code>  # rebase
 +
* <code>[[git config]] --global pull.[[ff]] only</code>
  
 
== See also ==
 
== See also ==

Revision as of 09:23, 22 July 2021

git pull 
Already up to date.
git pull
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 288 bytes | 288.00 KiB/s, done.
From ssh://gitlab.your_domain.com:2224/project/project-test
   b53cf50..611c5a3  master     -> origin/master
Updating b53cf50..611c5a3
Fast-forward
 file_1.txt | 1 +
 1 file changed, 1 insertion(+)
git pull
ssh: connect to host XXXXXXX port 2224: Operation not permitted
fatal: Could not read from remote repository.
git pull
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:

 git config pull.rebase false  # merge (the default strategy)
 git config pull.rebase true   # rebase
 git config pull.ff only       # fast-forward only

You can replace "git config" with "git config --global" to set a default
preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.

Your configuration specifies to merge with the ref 'refs/heads/master'
from the remote, but no such ref was fetched.


Related commands

See also

Advertising: