What causes git to make automatic commits on pull?
I have been working on different repositories and noticed a different behaviour: in one project when I pull other people's work into mine I just get their commit in my history, in another one git creates an automatic merge commit when I pull. In both cases there were no conflicts, and both repositories are bare repos on the same server.
What causes git to add or not add this automatic merge commit on pull?
I have a branch master which has a so-called hotfix-branch, hotfix/foo, on that hotfix-branch, I have several commits, say A, B and C. I then merge that into master with: git checkout master git mer
by now, I know that there is a nice way how to combine commits and change the commit message by using 'git rebase --interactive' Having the following situation: $ git rebase --interactive HEAD^^^^ pic
I'm working on project located in Github. Now I have made changes to the project and I want to do a pull request. I'm using this command : git pull but I get * branch master -> FETCH_HEAD Already
How can I revert a range of commits in git? From looking at the gitrevisions documentation, I cannot see how to specify the range I need. For example: A -> B -> C -> D -> E -> HEAD I w
I am trying to make a git pull request from the remote repo to local but it shows below error and not able to pull. Eg. git pull origin master error: The following untracked working tree files would b
I don't get this: when I 'git pull --rebase remote branch' it reverts my HEAD back to their shared root and then starts replaying all of the remote commits that have happened in the meantime. Why do t
I'm currently working a very simple git workflow using feature branches and rebasing on to master before pushing. git checkout -b feature .. make some commits git checkout master git pull If there a
I need help with a shell script to revert multiple commits in a new branch, then merge the result with one of existing branches. I have 3 branches in my project: dev, live and stage. stage branch is f
I am using git repository in my project. I have accidentally pushed 2 commits which I shouldn't have. And in between some one has committed on top of it. Is it possible to remove my pushed commits or
Which would be the simplest git workflow for signing some commits, in order to mark them as having passed a given review, or a set of given reviews? I suppose tagging them would create too many tags.
I am new to Git. I have one main branch development in which all branches will be merged and I'm working on branch TESST123 I have done three commits (using : git commit -am comment) and pushed
In git, what is the best / easiest way to bring a deployment branch up to date with master when the branch already contains cherry-picked commits from master, assuming you want to preserve the history
I have the following message in git: # Your branch and 'origin/master' have diverged, # and have 3 and 8 different commits each, respectively. # (use git pull to merge the remote branch into yours)
How do I rebase between commits: Lets say I want to rebase between init and commit 3 (squash these commits together) Lets say i have commit 5 commit 4 commit 3 commit 2 commit 1 commit init If I do
Is it possible for me to 'git commit --amend' 2 commits AFTER I have pushed? git commit git push git commit git push Can I some how combine the 2 commits that I did? Thank you.
I'd like to git log all the tagged commits on the master branch (and none of the untagged commits). Is this possible?
I started using git sometime back and do not fully understand the intricacies. My basic question here is to find out the difference between a git pull and git pull --rebase , since adding the --rebase
what does -u option with pull do? my current branch is master. does it pull from remote branch to my current branch(master)? is this command pulling from specified remote branch into my current(m
I'm trying to do a git pull and I'm getting error: Your local changes to 'someDir/someFile' would be overwritten by merge. Aborting. this is fine since I need to check these changes and decide whether
git diff is giving different results from git diff --summary, and git pull is giving me different results from the diffs. Each of the commands below tell me something different is modified. git.diff $
it is my first attempt to make git-svn project. I have Debian server with direct access. Info: - local SVN is one branch and i won't be doing any local or remote commits What i want to archive: Creat
I'm having a problem with editing commits. I have 2 commits for 2 .php files. My goal is to edit them both. I read about rebase -i and this is what I reckon is supposed to be done: first I change pic
I'm trying to update a git repo from a bash script and I've run into some trouble. I can run git pull and have it work if there is no other lines or characters after the git pull but if I say have #!/
I was trying the Perfect Workflow, with Git, GitHub, and SSH, and i have everything set up, except running the command git pull from php. When i run exec('git pull') i get: Could not create director
Looking through the git-config variables and git-pull documentation I don't see a way to make git-pull pull verbose by default. Anybody know of a way?
If someone deleted a remote branch because the work is over and I don't know, I won't do a git fetch --prune and eventually I will push back the deleted branch. Is there a viable solution for forcing
Pulling without any local commits deletes staged files without warning. How can one recover those files? Here is an example showing the issue: ~/git $ git --version git version 220.127.116.11 ~/git $ uname -
Is there a way with git-svn to determine how many commits ahead or behind I am? Thanks!
I forked popular project on GitHub that i want to contribute to. Now i made some changes to my master branch and pushed them to my master branch and made a pull request. However my pull request is now
Is there a way to see what commits have been pulled in from the remote repository after you do a git pull --rebase? In other words: git pull will show a summary of changed files at the end (like git
I can't git push/pull to github from my corporate vpn: git push origin master ssh: connect to host github.com port 22: Connection timed out fatal: The remote end hung up unexpectedly I assume this is
From the threads that I have read, git should set 644 by design, which is what I want. However, whenever I git pull my repository, it changes the permissions to 664. My local disk has permissions set
I am trying to do a 'git pull --rebase', but I don't see any remote changes. When I do a 'git status' I see ' Your branch is ahead of 'origin/master' by 12 commits.' But I am current on my 'dev' branc
What is the difference between doing: mkdir repo cd repo git init git remote add origin git://github.com/cmcculloh/repo.git git fetch --all git pull origin master and git clone git://github.com/cmccu
We ran gitstats and under the commits by domain we have some strange domains in their including another company(foo.com) that's down the street. Does anyone know where that information comes from?
If I have made multiple sets of changes to a large file, is it possible to split those into separate commits using git?
I wonder, what is the priority of picking commits during merge in the situation, described below. I have develop branch. D1 - D2 - D3 Then I created release branch from it and add some commits. D1 -
I was trying to understand the difference between the git pull and rebase, but everywhere I am finding the difference between merge and rebase. I understand the difference between merge and rebase , b
We are a team working with git, we have a central repository (single origin) we use to push and pull from (and capistrano use it to deploy the branch master) we make commits and deploy regularly (10~2
How do I pull from heroku? I have wordpress running in my heroku app and i changed some stuff via the template editor. I'd like to have these changes also locally. When i try to pull from heroku i get
I have the following history in my branch. commit 3 (origin/master) commit 2 commit 1 (master 2 behind) ... previous commits I want to remove commit 2 and 3 from the history. So that commit 1
I'm pretty new to Git and I think I created a mess in my master branch. Here's what happened: I was working (peacefully and without messing with anybody) and I got my commits like this. a --> b --&
I have a git repository and it is doing something I've never seen before and haven't found a solution anywhere. I initialized with git init and added everything with git add * and went on my way now w
Little bit confused.. In the git community manual, it says The git log command can show lists of commits. On its own, it shows all commits reachable from the parent commit; but you can also make mor
I was wondering if there is a generalized method for finding if a commit is a parent to another. git branch --contains <hash> Is almost what I want. It lists all branches that contain the commi
I'm trying to run git pull origin master on my production server, however it is failing with the following. From ssh://bitbucket.org/ala_arab/admnet * branch master -> FETCH_HEAD Auto-merging db/
Steve Losh: A Guide to Branching in Mercurial - Mercurial will push/pull all branches by default, while git will push/pull only the current branch. I wonder if my understanding is right: It occurs
I have a single branch git repository, that has ~4000 commits. I want to group the commits according to dates they were created. For example, given the commits below: abcd 2013-4-1 12:10 abce 2013-4-1
Now I have a git repository on a Windows machine, and would like to run automatic tests on this repository with Perl. To make sure that every time I launch the test the repository is the latest, I use
I have made a git pull request with my repo. Sometime later, before pull request got approved, I proceeded to make another commit&push which also got pushed up to pull request. Is there a way to r