git-branch

: A T / \ i B C m : : e D E \ / | F V : git merge-base B E allows to find where a the common ancestor A of the two commits. Is there a way to find the commit F where the two branches are merged again? Oops. Didn't read that carefully enough. The only information in a commit is the id of its parent (or parents). You cannot get to a child from a parent commit (this is the directed part of the repository being a DAG). Looking at this more - it looks like the --ancestry-path option for git log can do this. For instance given: * 85d26ab When compiling vim, also compile & install gvim * 3146e5d

Say there is a remote branch br1 checkout on the remote repo, and the master branch on a local repo. Command 1: If I do a " git pull origin br1:br1 " it pulls remote br1 into local br1 , and shows: 9188a5d..97d4825 br1 -> br1 9188a5d..97d4825 br1 -> origin/br1 command 2: If I do just a " git pull ", it will pull remote br1 into local master , but it shows only the following: 9188a5d..97d4825 br1 -> origin/br1 I'm expecting it also shows something like " br1 -> master ". Why it does not show that? Does " br1 -> br1 " mean pulling remote br1 into local br1 ? What does that " br1 -> origin/br1 "

The scenario is that I have no repos on the remote server, just an account. Then, I run locally the following commands, where x is the user name and y is the project name that only exists on my local system. git init git remote add buckety https://x@bitbucket.org/x/y.git git add . git commit --message "Here we go..." git push buckety Now I get the error urging me to set up the remote upstream. I can do that (either --set-upstream or -u ) but according to my googlearching, it's been deprecated. (Actually weird that the suggestion in the console mentions it still.) I want to do it the proper way

I cloned the mosquitto repo from https://github.com/eclipse/mosquitto . It contains a tag v1.4.9 . However it does not look like to be on a branch. How could that happen? Does the author actually keep a branch on his own repo but only pushed tags from that branch to github? Or does he just make a commit to a tag? I made the tag into a local branch: $ git checkout -b work149 v1.4.9 And looked at the last commit on the branch: $ git log -1 commit 91bfd82491f90e24b6fe9c036f0b04a1f5c14a89 Merge: bf959ef 2d0af73 Author: Roger A. Light <roger@atchoo.org> Date: Thu Jun 2 22:05:34 2016 +0100 Merge

Just when I thought I'd got the hang of the git checkout -b newbranch - commit/commit/commit - git checkout master - git merge newbranch - git rebase -i master - git push workflow in git, something blew up, and I can't see any reason for it. Here's the general workflow, which has worked for me in the past: # make sure I'm up to date on master: $ git checkout master $ git pull # k, no conflicts # start my new feature $ git checkout -b FEATURE9 # master @ 2f93e34 Switched to a new branch 'FEATURE9' ... work, commit, work, commit, work, commit... $ git commit -a $ git checkout master $ git merge