Just to add, you might want to check this project https://github.com/swaroopch/dotbash and a related blog post http://www.swaroopch.com/blog/bash-vim-setup/
-lijo On Fri, Sep 23, 2011 at 5:42 PM, Vishvananda Ishaya <vishvana...@gmail.com>wrote: > For working with git, you might want to add something like the following > to your .bashrc : > > https://gist.github.com/1237345 > > This will display the branch you are working on at your prompt, and even > change color based on whether the working tree is dirty. It helps in > situations like you mention to remind you when you are in the middle of a > rebase (you will see a red ((no branch))) > > Vish > > > On Sep 23, 2011, at 6:29 AM, Sandy Walsh wrote: > > Thanks Mark, that's a great reference. > > I had two things really trip me up yesterday. All my own fault of course, > but perhaps an area we can improve upon? > > 1. After making changes to my gerrit branch I fell back on old habits and > did a 'git commit -a' vs. 'git commit -a --amend' which caused a raft of > problems such as duplicate Change-ID entries and multiple review requests on > the resultant 'git review'. That and all the warnings in GerritWorkflow > about long lived branches. > > Perhaps if I had of performed a squash merge I could have > spotted/eliminated the other offending Change-ID's, but the change log > message only showed the latest one. So, the resultant complaint of no > Change-ID was extremely confusing to me. Old dogs, new tricks. > > In these situations it would be great to get a change log message that > includes all the commit messages back to where trunk matches up (if > possible). Or at least give a warning that a squash is recommended or that > there is more than one Change-ID in my commit history? Dunno. > > 2. It was unclear to me what the starting / ending commits were in the > interactive rebase that occurs during 'git review'. Although I knew 'review' > was going to do a rebase on me, when things failed I forget I was still in > an interactive rebase. Trying to solve those problems without aborting and > resetting just made matters worse. > > Take away: 'less tools/rfc.sh' ... and study it. > > Hope it helps other n00bs like myself. > > -S > > ________________________________________ > From: openstack-bounces+sandy.walsh=rackspace....@lists.launchpad.net [ > openstack-bounces+sandy.walsh=rackspace....@lists.launchpad.net] on behalf > of Mark McLoughlin [mar...@redhat.com] > Sent: Friday, September 23, 2011 8:41 AM > To: Vishvananda Ishaya > Cc: openstack@lists.launchpad.net (openstack@lists.launchpad.net) > Subject: Re: [Openstack] Nova Gerrit Move > > On Thu, 2011-09-22 at 23:34 -0700, Vishvananda Ishaya wrote: > > Hey Everyone, > > > Now that we've cut the Diablo release, we are moving Nova code hosting > > over to Github and reviews to Gerrit. Gerrit is new for those of you > > who haven't been contributing to the other projects that have already > > moved. You can find a set of instructions for getting up and running > > here: > > > http://wiki.openstack.org/GerritWorkflow > > > Here's some tips on for folks on how to move their existing merge props > to gerrit: > > http://wiki.openstack.org/MigrateMergePropFromLaunchpadToGerrit > > Cheers, > Mark. > > > _______________________________________________ > Mailing list: https://launchpad.net/~openstack > Post to : openstack@lists.launchpad.net > Unsubscribe : https://launchpad.net/~openstack > More help : https://help.launchpad.net/ListHelp > This email may include confidential information. If you received it in > error, please delete it. > > > > _______________________________________________ > Mailing list: https://launchpad.net/~openstack > Post to : openstack@lists.launchpad.net > Unsubscribe : https://launchpad.net/~openstack > More help : https://help.launchpad.net/ListHelp > >
_______________________________________________ Mailing list: https://launchpad.net/~openstack Post to : openstack@lists.launchpad.net Unsubscribe : https://launchpad.net/~openstack More help : https://help.launchpad.net/ListHelp