git-pull

Where are the pull/push commands in GitHub for Windows client?

我是研究僧i 提交于 2019-12-03 09:57:16
I've been using GitHub for Mac for a while and was about to help a colleague install it on Windows. I cannot find any menu or any button to initiate "push" or "pull" as I can on Mac. Only way I see it is to open a shell and execute git pull . But then, what's the point of the UI? What solved my problem? I switched to using SourceTree ( http://www.sourcetreeapp.com ) instead. It solved all my issues :) It's in the top right of the app. For most cases you'll want to hit the sync button which will both push and pull for you. You can also hit F5 to manually trigger it. When you have a new local

shell_exec and git pull

浪尽此生 提交于 2019-12-03 09:13:36
I was hoping someone could help, I have a PHP page which uses shell_exec to zip up a directory and run git pull to bring down recent repository changes. $op = shell_exec("cd /home/user/git/$repo/$dir/; zip -r /home/user/archives/$dir.$datestamp.zip $dir; cd /home/user/git/$repo/$dir/; git pull"); The zip works fine. If I change git pull to for example git log or git status - within my shell_exec, this works also, and I can see the log file. Just doesn't seem to like git pull. I saw another similar post to this, but wasn't sure how it was achieved >> Shell_exec with git pull? Mark Longair From

How do I pull missing file back into my branch

蓝咒 提交于 2019-12-03 06:25:37
问题 I have cloned git project into local git repository. Then I have done something nasty to one of the files and in that panic I deleted file physically from drive ( rm style.css ) and also removed it from git ( git rm style.css ). I want to get original style.css back from origin to my dev branch. Unfortunately my git thinks it is up-to-date and wont do anything. root@debian:~/project.me# git status # On branch dev nothing to commit (working directory clean) root@debian:~/project.me# git pull

How to configure “git pull --ff-only” and “git merge --no-ff”

天涯浪子 提交于 2019-12-03 05:57:44
A typical git workflow for me is to clone a remote repository and use git pull to keep it up-to-date. I don't want merge commits when I pull, so i use the --ff-only option. I also make local branches for feature work. I want to preserve the branch history, so when I merge the local branch back to my local clone, I use the --no-ff option. How can I configure git to use those options by default? Currently my .gitconfig looks like this: [merge] ff = false [pull] ff = only However, git pull (which is really git fetch and git merge) seems to be picking up the merge option and therefore creating

Git pull - Please move or remove them before you can merge

不羁岁月 提交于 2019-12-03 04:04:33
问题 I am trying to do a git pull origin master from my server but keep getting the error: Please move or remove them before you can merge. There are no untracked files, but it seems like it has issues with the ignored files for some reason. I tried running a git clean -nd to see what would be deleted and it lists a whole bunch of files that are ignored in .gitignore . How can I fix this so I can do a pull? 回答1: Apparently the files were added in remote repository, no matter what was the content

Is there a “git pull --dry-run” option in Git?

£可爱£侵袭症+ 提交于 2019-12-03 02:08:19
问题 Is there such a thing as git pull --dry-run to see how stuff will be merged before it messes up my working tree? Right now I am doing: git fetch origin && git merge --no-commit --no-ff I did not see anything in the man page for 'git-pull' related to it. To clarify, I just need it in an Ant script for deployment to see if there are conflicts when doing git pull , then back off exit out of build, fail deployment and leave that directory tree the same it was before git pull . 回答1: I have always

Undoing a git pull --rebase

江枫思渺然 提交于 2019-12-03 01:52:16
问题 Hey I'm new to git and I need to undo a pull, can anyone help?!? So what I've done is... git commit git stash git pull --rebase git stash pop this created a bunch of conflicts and went a bit wrong. Now doing 'git stash list' reveals that my stash is still there. Is it possible to revert my repo back to the point just after doing git commit. So effectively my repo only contains only changes I have made and nothing new from the server? 回答1: using git reflog you will see a list of commits HEAD

git pull error :error: remote ref is at but expected

眉间皱痕 提交于 2019-12-03 00:04:46
问题 Full message: error: Ref refs/remotes/origin/user is at 3636498c2ea7735fdcedc9af5ab3c8689e6abe77 but expected a21359c6cc2097c85775cde6a40105f4bd7100ec From github.com:{github project url} ! a21359c..6273ffc user -> origin/user (unable to update local ref) 回答1: If you are running git under a file system that is not case sensitive (Windows or OS X) this will occur if there are two branches with the same name but different capitalisation, e.g. user_model_changes and User_model_changes as both of

GIT pull/fetch from specific tag

删除回忆录丶 提交于 2019-12-02 19:07:34
Is there a way to pull/fetch code from a specific tag in a repo. Am aware that after clone, i can checkout to the tag but is it possible to specify a tag during a pull? In ClearCase i can rebase or deliver a specific baseline of code, is there a way where i can use git tags similarly to pull/push code upto a specified tag? It will be a bit different with ClearCase, because you can only rebase a baseline produced on the parent Stream (although you can deliver any baseline from any Stream to your Stream). So there are some limitations to the kind of merge you do with ClearCase. With Git, you can

Do a Git pull to overwrite local changes

扶醉桌前 提交于 2019-12-02 18:55:11
There has certainly been posts around for this, but I actually did a commit because I thought it was the right thing to do. So, I have two repositories, one development and one production. I had to edit something in the production because it was an urgent bugfix, and now I have three files that are newer in the production than in the development. I committed the three files on the production and tried a pull, but it told me there were merge errors. I tried copying and pasting the new files to the development server and retrying the whole thing and it didn't work. Now I'm sure that what I need