Disqus - Latest Comments for jcorbin_wunjo

Re: git ready » pull with rebase

jcorbin_wunjo — Thu, 12 Feb 2009 13:12:15 -0000

I'd like to add on to that "awesome tip", tracking branches are usually what you want by default.

More precisely: you'll know it if you don't want to track in my experience... soo:

% git config --global branch.autosetupmerge true

Is usually great that way when you say something like:
% git checkout -b <bla> <remote>/<bla>

Things work about as naturally as you'd expect.

--no-track is easy enough to add in the fewer cases where you don't want this behavior than it is to remember to always --track in git-checkout or git-branch.

Re: git ready » status in your prompt

jcorbin_wunjo — Tue, 27 Jan 2009 18:10:28 -0000

If you use zsh, you may be interested in my http://www.wunjo.org/zsh-git .

Re: git ready » ignoring files

jcorbin_wunjo — Thu, 22 Jan 2009 16:27:46 -0000

@glennfu

Instead of using ignores or unstaging changes at all, you'd be better off using a local branch, and developing in topic branchs. Example workflow like:

% git checkout --track -b local master
% git config branch.local.rebase true # the branch should always rebase on pull
% < tweak environment and commit in local>

Now let's say that for good form you keep topic branches well maintained, so:
% git checkout --track -b topic local
% git config branch.topic.rebase true # see man git-config to automate this and the --track above
% <work on="" topic,="" make="" some="" commits="">

So now you have this branch topic, that's based on your local change branch, and you want to merge changes back into master to push them up to some remote (f.e. your private publication repo that others pull from, or in the case of git-svn merge things into master to dcommit).

% git rebase --onto master local work
% git checkout master
% git merge work
% git branch -d work

Now the only thing left other than sending changes in master back upstream is to bring your local branch up to speed:
% git checkout local
% git pull # implies a rebase on head, see above