Closed. This question is opinion-based. It is not currently accepting answers. Want to improve this question? Update the question so it can be answered with facts and citations by editing this post. Closed 7 years ago. Improve this question We have a web app that we update and release almost daily. We use git as … Read more
I just started using Git and I got really confused between different branches. Can anyone help me to figure out what the following branch types are? local branches local tracking branches remote branches remote tracking branches What is the difference between them? And how do they work with each other? A quick demo code will … Read more
We have a Git repository with over 400 commits, the first couple dozen of which were a lot of trial-and-error. We want to clean up these commits by squashing many down into a single commit. Naturally, git-rebase seems the way to go. My problem is that it ends up with merge conflicts, and these conflicts … Read more
I want to find out who created a branch. I am sort of able to do so with: git branch -a | xargs -L 1 bash -c ‘echo “$1 `git log –pretty=format:”%H %an” $1^..$1`”‘ _ However, this returns the last committer per branch, not necessarily the person who created the branch. 12 Answers 12
I’m more of a novice when it comes to advanced operations in git. I maintain my blog using the blogging framework Octopress. Though Octopress is not under any development since 2011, it serves my purpose well and so I haven’t thought of changing anything so far. FYI, my blog is hosted on Github Pages. Today, … Read more
I have already got a local master branch tracking the remote master branch of a github project. Now, a collaborator of mine has created a new branch in the same project, and I want to do the following accordingly: create a new branch locally make this new branch track the newly create remote branch. How … Read more
Does Sourcetree offer a way to visualize differences between git branches? I’m looking for: names of files that have changed diffs between these files 4 Answers 4
I think I’m on the right track to understand the basic concepts of git. I’ve already set up and cloned a remote repository. I also created a server side empty repository, and linked my local repository to it. My problem is that I don’t understand the difference between: origin/master vs. remotes/origin/master As far as I … Read more
I am using the following command to find out if a local git branch with branch-name exists in my repository. Is this correct? Is there a better way? Please note that I am doing this inside a script. For this reason I’d like to use plumbing commands if possible. git show-ref –verify –quiet refs/heads/<branch-name> # … Read more
I used git checkout -b to create a new branch. I think that git branch does the same thing. How do these two commands differ, if they differ at all? 7 Answers 7
