Default git https://github.com/git/git/blob/8a36cd87b7c85a651ab388d403629865ffa3ba0d/builtin/fetch.c#L1332 (sighs)recurse_submodules_default zero, default) repository of submuds means you have something in configuration files, which makes git do it. But such behaviour can clearly be disconnected by pulling in such a way as:git pull --no-recurse-submodules It's a clear ban on getting fetched.

I see two different questions:Like one branch to replicate:# переключаемся на ту, куда копировать git checkout master # объединяем с той, из которой копируем git merge test-develop # если будут конфликты, правим их руками, а потом git add . git merge --continue How a github# убеждаемся, что удалённый репозиторий вообще настроен git remote -v переходим в нужную ветку и убеждаемся, что она не расходится с удаленным репозиторием git checkout test-develop git pull #тут могут быть конфликты пушим текущую ветку в новую удалённую и одновременно назначаем соответствие git push -u origin test-develop: в следующий раз можем пушить без указания подробностей git checkout test-develop git pull git push можем запушить все локальные ветки сразу git push --all

You probably created a new branch.ваша-новая-ветка) and git pull Receive such a message:$ git pull 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> новая-ветка There's a clue in the message.one-time " injection " from (e.g.) branches master Repository origin Implement:$ git pull origin master so that this branch can be implemented git pull without arguments, and there was " infusion " from the branch master Repository origin♪$ git branch --set-upstream-to=origin/master ваша-новая-ветка

pre-reminence: branch git - it's just a flame marker.team:$ git pull origin master Not updated (and not updated) origin/master, only the index masterby moving him to one (in your case) comedian.Here's the team. status and tells you that your current index master (ahead) from the indicator origin/master♪To " correct the omission " , it is sufficient, for example: $ git fetch From url-репозитория xxxxxxx..yyyyyyy master -> origin/master It appears in the attached conclusion that the reference is being updated origin/master♪after the team. status shall not report to you any discrepancy between the indexes.I don't know why you write. git pull origin masterConsidering that the current branch is already tied to you with a branch master Repository originIt's quite simple:$ git pull And you won't have the discrepancies described.

Important: Changes made locally will be lost. Like an option. --hardand without it, any local rooms not sent to the server will be lost. [*]If you have any Not Traceable local files (e.g. downloaded users) will not be affected.It is likely that the right solution in this case will be:git fetch --all git reset --hard origin/master Or if you're in another branch:git reset --hard origin/your_branch Description:Team git fetch Fills up the last version of the remote repository files without trying to merge or synchronize.merge or rebase)Then git reset appoints the main branch of the one you just updated. Operation --hard Changes all the files on your work grid in line with the files on the origin/master[*]: It is important to note that the relevance of local changes can be maintained if a separate branch is established. master before I do git reset:git checkout master git branch new-branch-to-save-current-commits git fetch --all git reset --hard origin/master Then all the old versions will be stored. new-branch-to-save-current-commits♪ Unconfirmed changes, however (even indexed) will be lost. So index and add to local repositories all you might need.Translation of response https://stackoverflow.com/a/8888015/564240 ” https://stackoverflow.com/users/489564/ ♪

I understand:if team pull --rebase Achieved (or conflicts have been eliminated by editing, adding files to the index)add ...and follow-up rebase --continue)if team push A successful conclusion has been achieved (the end-of-the-art net has not been " moving " in this time, thanks to the addition of new commites or even (partial) correspondence of history)♪ and the branch in your local area, and the branch in the remote repository, will indicate the same comedian. That guarantees the full identity of the whole comemite tree for which the comemite is a " superhuska " (the fact that in these two repositories history may have a different " deep " , in this case, I think it is possible to ignore).

Based on response: https://stackoverflow.com/a/17227804/4827341 For partial automation, for example, pseudonyms may be used:$ git config --global alias.accept-ours = "!f() { [ -z \"$@\" ] && set - '.'; git checkout --ours -- \"$@\"; git add -u -- \"$@\"; }; f" $ git config --global alias.accept-theirs = "!f() { [ -z \"$@\" ] && set - '.'; git checkout --theirs -- \"$@\"; git add -u -- \"$@\"; }; f" conflict after conflict git pull for files/calories to be oursto fulfil:$ git accept-ours -- файлы/каталоги ... a for those to be theirs:$ git accept-theirs -- файлы/каталоги ...

Flag-git-dir=pot_.git will help you, or the GIT_DIR variable environment, and that's all. https://ru.stackoverflow.com/questions/371517/%D0%92%D1%8B%D0%BD%D0%B5%D1%81%D1%82%D0%B8-%D1%80%D0%B5%D0%BF%D0%BE%D0%B7%D0%B8%D1%82%D0%BE%D1%80%D0%B8%D0%B9-%D0%B8%D0%B7-%D1%80%D0%B0%D0%B1%D0%BE%D1%87%D0%B5%D0%B3%D0%BE-%D0%BA%D0%B0%D1%82%D0%B0%D0%BB%D0%BE%D0%B3%D0%B0

Get the team in the console. git remote -v And look at the protocol you have access to the repository.If it's https, it's about the next way:https://github.com/USERNAME/OTHERREPOSITORY.git For ssh, it will be like:git@github.com:USERNAME/OTHERREPOSITORY.git httpsRequire Git version not below 1.7.10In this case, you always need to indicate the password when you contact the server. Git. https://www.kernel.org/pub/software/scm/git/docs/v1.7.9/gitcredentials.html For a period of time (with 15 minutes default) command data:> git config --global credential.helper cache If you wish, you can change the standard command time.> git config --global credential.helper "cache --timeout=3600" (second time)You may also indicate git to keep your data permanently:> git config credential.helper store At the same time, your data will be stored in an open file of .git-credentials.The team can cancel this opportunity:> git config --unset credential.helper If you wish, you can have such behaviour for all repositories, so you need to hand over the extra key. --global♪Depending on this construction, your data will be available either in the project catalogue or in the project catalogue. $HOMEFor Git versions below 1.7.10You can provide information for authorization in the url where you have access to the repository, so it needs to be transformed:https://username:password@github.com/USERNAME/OTHERREPOSITORY.git Change the current url in remote to the specified (as described below in the response) and the authorisation will not be requested.Remember that in this case, your data will be kept in public.For Git version not below 0.99There is an opportunity to build https://stackoverflow.com/questions/6031214 SSHThe only thing I know about working with the evaporated SSH key is build-up. https://help.github.com/articles/generating-ssh-keys/ which would also prevent the introduction of ssh key passwords each time.For starters. https://help.github.com/articles/generating-ssh-keys/ ssh-key with a team:> ssh-keygen She'll ask for a file name (in many cases you can leave a name on default) and password. If you wish, you can leave the password empty, just press Enter twice when you ask for the password. https://help.github.com/articles/working-with-ssh-key-passphrases/ )Couple of keys appear in the catalogue ~/.ssh/♪ You need to copy the contents of the file. id_rsa.pub (if you didn't put another in the creation of the key) and keep it in your profile on GitHub.After that, we can move to the building. ssh-agent:Do the team:> echo $SSH_AGENT_PID If ssh-agent Started, his trial number should be returned. In this case, the following paragraph may be missed and the team may proceed. ssh-add♪If the empty line is back, we need to start. ssh-agent before proceeding.Launch. ssh-agent Against:> eval "$(ssh-agent -s)" # Agent pid 59566 Now we have to add a generated key to ssh-agent:> ssh-add ~/.ssh/id_rsa If you create ssh access to your key repository, work is likely to be done from programmes.For a repository already established https://help.github.com/articles/changing-a-remote-s-url/ using the team> git remote set-url origin <new-url> where <new-url> Makes a way in which the necessary protocol is used.

Teams to help you.git fetch --all git reset --hard origin/master The first team is downloading all the changes, with no localization, and the second will move all the changes to the origin/master &apos; s state.

Let's say you worked with the branch before. master..and you've been informed that most of the repository has created a branch for you. test♪You will receive all updates from the main repository:$ git fetch After that, you'll see the branch test Major Repository (command extraction - indicative):$ git branch -r origin/HEAD -> origin/master origin/master origin/test create a branch in your local repository (e.g., test(b) By tying it to the branch immediately test from main repository:$ git checkout -b test origin/test Branch test set up to track remote branch test from origin. Switched to a new branch 'test' Now you can make changes, bring them in, send them to the main repository team:$ git push and receive updates from this branch of the main repository by the team:$ git pull and &quot; merging &quot; committs from another branch:$ git merge другая-ветка At any time (well, almost any) you can turn your work copy of the files into another branch:$ git checkout другая-ветка and turn back:$ git checkout test

So, git pull = git fetch+git mergecan (and if there is any doubt) be implemented separately git fetchand keep quiet.

After the server bullet, git lfs pull

GIT withdraws information messages as in the case of git show ...♪ git satus ... on standard withdrawal flow, etc.stdout) Reports containing performance and diagnostic information, as in the case of git pull ...to the flow of errorsstderr)We need to redirect the flow of errors to the standard flow detector:var1=$(git pull 2>&1) Or use a variable environment. GIT_REDIRECT_STDERR='2>&1'if available, see. https://git-scm.com/docs/git#Documentation/git.txt-codeGITREDIRECTSTDERRcode ♪

You can perform to update your repository:git commit -m "Your commit text" git pull Either remove the current director of the repository and clone it again with GitHub:git clone example.com # example.com - Remote repo url

In my case, the following teams helped:rm .git/refs/remotes/origin/master git fetch Here. https://stackoverflow.com/questions/2998832/git-pull-fails-unable-to-resolve-reference-unable-to-update-local-ref In response to the English-speaking StackOverflow, where the matter was resolved.

git pull That's it. git fetch + git merge♪git fetch Update local repository data (repository)fetch and there's a team for renewal, but the local index remains at the same location as before.So, yes, your understanding is generally correct. There is no information in the remote database on the disposal of the file and, in fact, if there has been no commites to the base since the last bullet/fetch, there has been no room in the process. git fetch Nothing's going on. git status Show you what. $ git status On branch master Your branch is up to date with 'origin/master'. Changes to be committed: (use "git reset HEAD <file>..." to unstage) deleted: file.txt I mean, your local base is synchronized with the remote and there's one change without a commite.If there were changes in the remote database, then git fetch It'll be like,$ git status On branch master Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) Changes to be committed: (use "git reset HEAD <file>..." to unstage) deleted: file.txt A git checkout It's a little different.

It's time to learn English without him in programming.You're required to indicate the remote branch in the pool that will be measured in the local area.git pull remote_branch

Found a way to do this:git fetch --all git reset --hard origin/master Team git fetch Fills up the last version of the remote repository files without trying to merge or synchronize.merge or rebase)A team git reset appoints the main branch of the one you just updated. Operation --hard Changes all the files on your work grid in line with the files on the origin/master

team push and pull share the same pair of configuration parameters: the name of the vault and the name of the branch.this couple shall be used unless it is clearly indicated in the performance of the team.Example from the storage file:$ grep -A 1 master .git/config [branch "master"] remote = origin merge = refs/heads/master Parameter remote ( &quot; full &quot; name that can be used for git config ♪ branch.ветка.remote- contains the name of the vault and the parameter merge ( &quot; full &quot; ) branch.ветка.merge- contains the name of the branch in this vault.Not possible pull and push indicate different No two branches. different Parameters merge-для-pull and merge-для-push)Similarly, it is not possible to &quot; tie &quot; the branch (tracked) separately. push and pullThe commands you have in paragraphs 1 and 3 are synonyms. man git-branchgit branch (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>] (technically, they add two parameters remote and merge Section [branch "ветка"])Similarly, it is not possible to &quot; untracked &quot; , separately for a branch push and pull..the team you set up in paragraph 2 git branch --unset-upstream [<branchname>] Make it impossible to challenge (without a clear indication of the vault and the branch) as pulland push (technically, she'll just delete both parameters. remote and merge)Supplement concerning the addition of the question, starting with:Why? --unset-upstream doesn't remove the branch git push?Initiated a new vault, tied to a remote storage facility (under the name) trNo branch in the local repository has yet been linked to ( &quot; tracked &quot; ) with any removed branch which can be ascertained by looking at it. .git/conig (no one section) [branch "имя"] No, no. push or pull (without explicit reference to the name of the vault and the name of the branch).Implementing team git pull имя-хранилища имя-веткиYou've been given the status of that branch, but there's still no local branch that's connected to any remote (contained) .git/config No change.And since there's no link to the branch, there's nothing to be said to you about. branch --unset-upstream:fatal: The &quot;master &quot; branch has no information on the parent branch