git-branch

Pretend I branched from my master branch to a topic branch, and then I did a few commits on my topic branch. Is there a command that tells me the commit hash on the master branch that my topic branch originated from? Ideally, I wouldn't have to know how many commits I've made ( trying to avoid HEAD^5 ). I've googled and SO'd around and can't seem to land on the answer. Thanks! knittl use git merge-base master your-branch to find the best common ancestor between two branches (usually the branching point). You can use git reflog show --no-abbrev <branch name> . It will output all changes made to

I'm trying to learn how to use Git effectively and I'm wondering how I should (good practice/bad practice?) solve the following case: Say I have the following chain of commits in master: Initial commit Commit 1 Commit 2 Commit 3 Then I realize that what's done in the last two commits is completely wrong and I need to start from Commit 1 again. Questions: How should I do that? Can I move Commit 2 and 3 to a separate branch to keep for future reference (say they weren't that bad after all) and continue working from Commit 1 on master? VonC git branch tmp # mark the current commit with a tmp

When you run git pull on the master branch, it typically pulls from origin/master . I am in a different branch called newbranch , but I need to run a command that does a git pull from origin/master into master but I cannot run git checkout to change the selected branch until after the pull is complete. Is there a way to do this? To give some background, the repository stores a website. I have made some changes in newbranch and deployed them by switching the website to newbranch . Now those changes have been merged upstream into the master branch, I am trying to switch the website back to the

The man page for git-config lists these options for push.default: nothing - do not push anything. matching - push all matching branches. All branches having the same name in both ends are considered to be matching. This is the default. upstream - push the current branch to its upstream branch. tracking - deprecated synonym for upstream. current - push the current branch to a branch of the same name. In most cases I would assume that pushing to a branch's upstream branch would be the same as pushing to a branch of the same name, since the upstream branch would normally have the same name, and

I've been watching some of the Team Treehouse videos and they have a very nice looking terminal when working with Git. For example they have (something similar): mike@treehouseMac: [/Work/test - feature-branch-name] $ git add . mike@treehouseMac: [/Work/test - feature-branch-name] $ git commit -m "Some feature." mike@treehouseMac: [/Work/test - feature-branch-name] $ git checkout master mike@treehouseMac: [/Work/test - master] $ git status How can my terminal show me some useful information of what branch I'm on, with colors to distinguish bits of the data I want? Is there some sort of de

I have a local branch tracking the remote/master branch. After running git-pull and git-log , the log will show all commits in the remote tracking branch as well as the current branch. However, because there were so many changes made to the remote branch, I need to see just the commits made to the current local branch. What would be the Git command to use to only show commits for a specific branch? Notes: Configuration information: [branch "my-branch"] remote = origin merge = refs/heads/master Assuming that your branch was created off of master , then while in the branch (that is, you have the

I am a new git user and recently been handed with an out of date git repository to look after. This is the original state ( output by git show-branch): ! [cr232] CR 232 Release * [dev] Style Changes --------------- * [dev] Style Changes * [dev^] SMS 5.4 * [dev~2] Logo Change * [dev~3] SMS 5.3 * [dev~4] SMS 5.2 * [dev~5] SIT R-0.3.3 EDW SMS Layers * [dev~6] SIT Release R 0.3.0 +* [cr232] CR 232 Release +* [cr232^] Dashboard Fix +* [cr232~2] Release for system testing Note that there is a branch called ‘dev’ at this point. Note that highlighted there are several references to dev (i.e. dev, dev^