Re: git rebase and gitk

2011-02-28 Thread Graham Percival
On Sun, Feb 27, 2011 at 09:23:00PM +0100, Reinhold Kainhofer wrote: > Am Sonntag, 27. Februar 2011, um 21:03:35 schrieb Graham Percival: > > git rebase -i origin/master > > > > are there any dangers with that? > > That's why a do a "git rebase origin/master" (non-interactive) > first, where I o

Re: git rebase and gitk

2011-02-27 Thread Reinhold Kainhofer
Am Sonntag, 27. Februar 2011, um 21:03:35 schrieb Graham Percival: > On Sun, Feb 27, 2011 at 11:20:18AM -0800, Patrick McCarty wrote: > > It is worth noting that `git rebase' is a very powerful command, since > > you can potentially rewrite all of git history with it. So, in > > general, be carefu

Re: git rebase and gitk

2011-02-27 Thread Graham Percival
On Sun, Feb 27, 2011 at 11:20:18AM -0800, Patrick McCarty wrote: > On Sun, Feb 27, 2011 at 7:00 AM, Graham Percival > wrote: > >  git rebase -i master^^ > > (however many ^ you need to cover all your recent work) > > This lets you clean up your git history before pushing to master, > > thereby

Re: git rebase and gitk

2011-02-27 Thread Reinhold Kainhofer
Am Sonntag, 27. Februar 2011, um 20:20:18 schrieb Patrick McCarty: > It is worth noting that `git rebase' is a very powerful command, since > you can potentially rewrite all of git history with it. So, in > general, be careful that you're not modifying commits that have > already been pushed to sa

Re: git rebase and gitk

2011-02-27 Thread Patrick McCarty
On Sun, Feb 27, 2011 at 7:00 AM, Graham Percival wrote: > Hi Mike, > > Could I introduce you to the wonders of git-rebase ?  In > particular: >  git rebase -i master^^ > (however many ^ you need to cover all your recent work) > This lets you clean up your git history before pushing to master,

git rebase and gitk

2011-02-27 Thread Graham Percival
Hi Mike, Could I introduce you to the wonders of git-rebase ? In particular: git rebase -i master^^ (however many ^ you need to cover all your recent work) This lets you clean up your git history before pushing to master, thereby giving us a much less cluttered history. I also recommend r