<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "> For working with git, you might want to add something like the following to your .bashrc :<div><br></div><div><a href="https://gist.github.com/1237345">https://gist.github.com/1237345</a></div><div><br></div><div>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)))</div><div><br></div><div>Vish</div><div><br></div><div><br><div><div>On Sep 23, 2011, at 6:29 AM, Sandy Walsh wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>Thanks Mark, that's a great reference.<br><br>I had two things really trip me up yesterday. All my own fault of course, but perhaps an area we can improve upon?<br><br>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. <br><br>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.<br><br>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.<br><br>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. <br><br>Take away: 'less tools/rfc.sh' ... and study it. <br><br>Hope it helps other n00bs like myself.<br><br>-S<br><br>________________________________________<br>From: <a href="mailto:openstack-bounces+sandy.walsh=rackspace.com@lists.launchpad.net">openstack-bounces+sandy.walsh=rackspace.com@lists.launchpad.net</a> [<a href="mailto:openstack-bounces+sandy.walsh=rackspace.com@lists.launchpad.net">openstack-bounces+sandy.walsh=rackspace.com@lists.launchpad.net</a>] on behalf of Mark McLoughlin [<a href="mailto:markmc@redhat.com">markmc@redhat.com</a>]<br>Sent: Friday, September 23, 2011 8:41 AM<br>To: Vishvananda Ishaya<br>Cc: <a href="mailto:openstack@lists.launchpad.net">openstack@lists.launchpad.net</a> (<a href="mailto:openstack@lists.launchpad.net">openstack@lists.launchpad.net</a>)<br>Subject: Re: [Openstack] Nova Gerrit Move<br><br>On Thu, 2011-09-22 at 23:34 -0700, Vishvananda Ishaya wrote:<br><blockquote type="cite">Hey Everyone,<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">Now that we've cut the Diablo release, we are moving Nova code hosting<br></blockquote><blockquote type="cite">over to Github and reviews to Gerrit. Gerrit is new for those of you<br></blockquote><blockquote type="cite">who haven't been contributing to the other projects that have already<br></blockquote><blockquote type="cite">moved. You can find a set of instructions for getting up and running<br></blockquote><blockquote type="cite">here:<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"> <a href="http://wiki.openstack.org/GerritWorkflow">http://wiki.openstack.org/GerritWorkflow</a><br></blockquote><br>Here's some tips on for folks on how to move their existing merge props<br>to gerrit:<br><br> <a href="http://wiki.openstack.org/MigrateMergePropFromLaunchpadToGerrit">http://wiki.openstack.org/MigrateMergePropFromLaunchpadToGerrit</a><br><br>Cheers,<br>Mark.<br><br><br>_______________________________________________<br>Mailing list: <a href="https://launchpad.net/~openstack">https://launchpad.net/~openstack</a><br>Post to : <a href="mailto:openstack@lists.launchpad.net">openstack@lists.launchpad.net</a><br>Unsubscribe : <a href="https://launchpad.net/~openstack">https://launchpad.net/~openstack</a><br>More help : <a href="https://help.launchpad.net/ListHelp">https://help.launchpad.net/ListHelp</a><br>This email may include confidential information. If you received it in error, please delete it.<br><br></div></blockquote></div><br></div></body></html>