I was intially working on a software branch I called mileshappy. I
pushed to a remote repository, and cloned it to 2 subdirectories, one
called master and the other called refactor. Master is the main
release branch, mileshappy will contain customisations, refactor is
the one that involves reorganisation of the code.

When I do a 'git remote show origin' on all branches I see the are
branches with the pulls and pushes referring to the other branches
which I don't want.

The only thing I want is to be able to compare changes in mileshappy
with changes in master and merge those I want, and do something
similar between refactor and master in the near future. Some of the
changes in master may go into the refactor branch but between master
and mileshappy it will always be one way from master to mileshappy.
Hopefully I will master using subtrees and submodules Konstantin
mentioned in the futre.

The refactor branch too does not have its own branch to push to so I
would like it to have its own branch to push to and stop merging with
mileshappy. I think I have this problem because I didn't master the
art of creating a new branch on the remote and downloading or checking
out only that branch during the cloning process.

The question of what HEAD in capitals is also an issue here, but I
hope I can also fix tht as well.

# get remote show origin > refactor.state
* remote origin
  Fetch URL: rca...@192.168.4.78:/home/rcagit/repos/rca_uberapp.git
  Push  URL: rca...@192.168.4.78:/home/rcagit/repos/rca_uberapp.git
  HEAD branch: mileshappy
  Remote branches:
    HEAD              tracked
    master            tracked
    mileshappy          tracked
  Local branch configured for 'git pull':
    refactor merges with remote mileshappy


# get remote show origin > master.state
* remote origin
  Fetch URL: rca...@192.168.4.78:/home/rcagit/repos/rca_uberapp.git
  Push  URL: rca...@192.168.4.78:/home/rcagit/repos/rca_uberapp.git
  HEAD branch: mileshappy
  Remote branches:
    HEAD              tracked
    master            tracked
    mileshappy tracked
  Local branches configured for 'git pull':
    master            merges with remote master
    mileshappy merges with remote mileshappy
    oldmaster         merges with remote mileshappy
  Local refs configured for 'git push':
    master            pushes to master            (up to date)
    mileshappy pushes to mileshappy (up to date)

#git remote show origin > mileshappy.state
* remote origin
  Fetch URL: rca...@192.168.4.78:/home/rcagit/repos/rca_uberapp.git
  Push  URL: rca...@192.168.4.78:/home/rcagit/repos/rca_uberapp.git
  HEAD branch: mileshappy
  Remote branches:
    HEAD              tracked
    master            tracked
    mileshappy tracked
  Local branches configured for 'git pull':
    master            merges with remote master
    mileshappy merges with remote mileshappy
  Local refs configured for 'git push':
    master            pushes to master            (up to date)
    mileshappy pushes to mileshappy (local out of date)


I think a major cause of confusion with git is too many shortcuts
taught to early, before the full syntax is taught properly.

/vfclists

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to