current community

your communities

more stack exchange communities

Stack Exchange
tour help
careers 2.0

Tagged Questions

1
vote
2answers
38 views

determining which merge commit caused a specific commit to be merged into my branch

Given the following history: master A-B-C-D-E-F \ topic G-H-I What git command can I use to determine that C caused G to be merged into master? Said another way, ignoring the ...
1
vote
2answers
1k views

How to update my local repo using git pull without pushing

I have a local branch where I haven't done any changes. Then I do git checkout anotherbranch # Switched to branch 'anotherbranch' # Your branch is behind 'origin/anotherbranch' by 25 commits, and can ...
0
votes
2answers
318 views

How do I merge commits after I have already pushed on Git?

I am new to git, I committed some changes, git told me that I need to pull first, so I pulled but my editor didn't display the modified versions, so I committed again with conflicts, I resolved the ...
0
votes
1answer
183 views

Git merge error: cannot run Sublime_Text_2: No such file or directory

I'm on my hot fix branch, and I just did git add ., and git commit -m "added well style" Then I did: johns-mbp:blackjack johncurry$ git checkout master Switched to branch 'master' ...
0
votes
1answer
33 views

SVN log details of uncommitted merge

I had recently merged my branch with the latest revision of the trunk. However, I did not commit at that time and do not remember with which trunk version I had merged. Currently, I need the trunk ...
0
votes
1answer
68 views

git merges have many parents an children within one branch. Is it OK?

We started using git a few days ago. Some developers didn't pull the changes before pushing their commits to the our central repository. Now we have a tree where some commits have two parents and/or ...
0
votes
1answer
451 views

Prevent git from automatic commit after merge: --no-commit by default

I've switched to Git recently from bzr, and while I've gotten used to the differences there is one thing I am wondering if it is possible: In bzr, when you merge there is not a implicit commit. The ...
1
vote
0answers
108 views

Github pull request showing commits that are already in target branch

I'm trying to review a pull request on Github to a branch that isn't master. The target branch was behind master and the pull request showed commits from master, so I merged master and pushed it to ...
0
votes
0answers
19 views

SVN trying to commit already commited changes

My problem is as follows: I committed some changes to one file and my coworker wanted to commit her part also on that file. She got warning she needs to update before commit and so she did. Then she ...
0
votes
0answers
257 views

Android Studio Git Error:Error executing git commit --only -F C:\Users

I am using Android Studio 0.5.1 with git plugin. I tried to Commit my changes, after merging conflicts from a pull. Error:Error executing git commit --only -F ...
0
votes
0answers
64 views

Git did not create a single commit object, despite --no-ff

Consider this merge made on Git 1.7.10.4 on Ubuntu Linux: $ git merge --no-ff issue534 Merge made by the 'recursive' strategy. public_html/includes/classes/class.merchant.php | 70 ...
0
votes
0answers
22 views

How to not update database when merge was not called

I have a web application that handles my database entities in various ways. The problem is that hibernate commit() is updating my database even when I didn't call any merge() or update(). I found that ...
0
votes
0answers
17 views

git pulling from one repo and updating several branch

I have to branches A and B. I want to add to B all the changes that were pulled from remote repo into A. What is the best way to do that ? Because I tried git cherry-pick #sha_pull_into_A, where ...