Does anybody know the difference between these two commands to switch and track a remote branch? git checkout -b branch origin/branch git checkout –track origin/branch I think both keep track of the remote branch so I can push my changes to the branch on origin, right? Are there any practical differences? 4 Answers 4
I have a local branch of a project (“configUpdate”) that I’ve forked from somebody else’s project and I’ve done a load of changes on it and would like to merge the changes they’ve made in to my local branch. I’ve tried git pull –rebase origin configUpdate but it hasn’t grabbed the latest changes – how … Read more
I’ve pulled all remote branches via git fetch –all. I can see the branch I’d like to merge via git branch -a as remotes/origin/branchname. Problem is it is not accessible. I can’t merge or checkout. 5 Answers 5
I created a local branch for testing Solaris and Sun Studio. I then pushed the branch upstream. After committing a change and attempting to push the changes: $ git commit blake2.cpp -m “Add workaround for missing _mm_set_epi64x” [solaris 7ad22ff] Add workaround for missing _mm_set_epi64x 1 file changed, 5 insertions(+) $ git push fatal: The current … Read more
What is the best way to get a log of commits on a branch since the time it was branched from the current branch? My solution so far is: git log $(git merge-base HEAD branch)..branch The documentation for git-diff indicates that git diff A…B is equivalent to git diff $(git-merge-base A B) B. On the … Read more
I can’t really ever think of a time when I would use git merge rather than git rebase and not want to have a commit show up. Is there any way to configure git to have fast forwarding off by default? The fact that there’s an –ff option would seem to imply that there’s a … Read more
Is there a way to see what files have changed in a branch? 16 Answers 16
Which characters are illegal within a branch name? 5 Answers 5
I have a git branch called 9-sign-in-out with perfectly working code, and I want to turn it into the master. I’m currently on the master branch. $ git branch 9-sign-in-out * master I’m trying to switch to 9-sign-in-out branch, but it doesn’t allow me to: $ git checkout 9-sign-in-out app/helpers/application_helper.rb: needs merge config/routes.rb: needs merge … Read more
Is there a way in Git to have a ‘description’ for branches? While I try to use descriptive names, working for a while on a single branch sometimes dampens my memory of why I made some of the other topic branches. I try to use descriptive names for the branches, but I think a ‘description’ … Read more
