On Thu, Aug 22, 2013 at 11:44 AM, Ondřej Čertík <ondrej.cer...@gmail.com> wrote: > On Wed, Aug 21, 2013 at 2:08 PM, Aaron Meurer <asmeu...@gmail.com> wrote: >> On Wed, Aug 21, 2013 at 10:02 AM, Ondřej Čertík <ondrej.cer...@gmail.com> >> wrote: >>> On Tue, Aug 20, 2013 at 3:47 PM, Aaron Meurer <asmeu...@gmail.com> wrote: >>>> You shouldn't make a new clone to get people's work. You should only >>>> ever create one clone per project. To add other people, use git >>>> remotes in your original clone, like >>>> >>>> git remote add pernici https://github.com/pernici/sympy.git >>>> git fetch pernici >>>> git checkout pernici/master # Or whatever the branch name is >>> >>> This only checks out the remote branch, which is great for quick testing. >>> For longer term work, I prefer to have local branch. So I do: >>> >>> git checkout -t pernici/branch_name >>> >>> Then it creates a "branch_name" branch, which tracks the remote >>> pernici/branch_name. >>> If Mario pushes more patches into it, you just do "git pull". >>> >>> Ondrej >> >> Different strokes. I prefer to work in detached head mode. The only >> exception is when I want to commit some changes to push up against the >> branch. The nice thing about detached head mode is that you can do >> things without cluttering up branches. For example, you can just do >> >> git merge master >> >> on the detached head to merge the branch with master, but without >> affecting any kind of tracking branch. > > So if you merge on a detached head, it will create another detached > merge commit, > so I assume the only disadvantage is that if you want to move to master and > then > back to this merge commit, you need to remember the hash, or use "git reflog".
I only do it when I know that I will never need it again. If I think that I will, I save it with git checkout -b. Aaron Meurer > >> >> And anyway, I 99% of the time don't want to use the branch more than >> once, so creating a local branch for it each time just clutters >> things. >> >> But it's good to know the alternatives. The important thing in git is >> to just know what is going on. That way, in any situation, the correct >> commands to use is simply dictated by whatever it is you want to do, >> rather than some kind of quick start guide or cheat sheet. > > Ondrej > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to sympy+unsubscr...@googlegroups.com. > To post to this group, send email to sympy@googlegroups.com. > Visit this group at http://groups.google.com/group/sympy. > For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups "sympy" group. To unsubscribe from this group and stop receiving emails from it, send an email to sympy+unsubscr...@googlegroups.com. To post to this group, send email to sympy@googlegroups.com. Visit this group at http://groups.google.com/group/sympy. For more options, visit https://groups.google.com/groups/opt_out.
