Hi List, I still don't understand the way branches are shown in magit, especially the relation between tracking branches and its local copies.
Here is the situation: ,------------------------------------------------ | $ git branch # local branch | * master | | $ git branch -r # remote branch | origin/master | | $ git remote # repository alias | origin | | | $ git remote show origin | * remote origin | Fetch URL: [email protected]:ab.git | Push URL: [email protected]:ab.git | HEAD branch: master | Remote branch: | master tracked | Local ref configured for 'git push': | master pushes to master (local out of date) | `------------------------------------------------ This is how 'b v' shows the branches in magit: ,----------------------------------- | * 80d58c2 master [remotes//master] | 80d58c2 remotes/origin/master `----------------------------------- Now I ask myself the following, probably rather newbie questions: 1. do I have a tracking branch (remotes/origin/master)? 2. Is it a sound workflow to pull and push from master, or should I rather make a local copy of master, say 'work-branch', and do all the work in that branch, and then merging with master? 3. what do I do with that remotes/origin/master branch? nothing, just ignore it? or use it to pull from the remote repository and then merge with master? Thanks for any hints. -- cheers, Thorsten
