| xtoddx | what do I do if i did a normal commit instead of a commit --amend on a branch that is up for review? | 00:03 |
|---|---|---|
| notmyname | xtoddx: have you pushed it yet? | 00:08 |
| notmyname | xtoddx:if not, squash the 2 commits together and keep the change id from the first commit in the squashed commit message | 00:09 |
| notmyname | then push | 00:09 |
| xtoddx | git commit --squash or some variation of git rebase? | 00:10 |
| notmyname | git rebase -i | 00:10 |
| notmyname | xtoddx: rebase -i means "interactive" so you get to pick the commits and apply them, skip them, or squash them. in this case, you want to squash them into one. you will pick the first commit then squash the rest into it | 00:13 |
| xtoddx | cool, thanks | 00:13 |
| *** adjohn has joined #openstack-dev | 00:17 | |
| *** martine has joined #openstack-dev | 00:20 | |
| *** jdurgin has quit IRC | 00:22 | |
| *** donaldngo_hp has quit IRC | 00:24 | |
| *** Oneiroi has quit IRC | 00:28 | |
| *** vladimir3p has quit IRC | 00:38 | |
| *** jdurgin has joined #openstack-dev | 00:39 | |
| *** martine_ has joined #openstack-dev | 00:43 | |
| *** martine has quit IRC | 00:46 | |
| *** lorin1 has joined #openstack-dev | 01:02 | |
| *** lorin1 has quit IRC | 01:05 | |
| *** lorin1 has joined #openstack-dev | 01:06 | |
| *** lorin1 has left #openstack-dev | 01:07 | |
| *** nhubbard_away is now known as nhubbard | 01:24 | |
| openstackgerrit | Renuka Apte proposed a change to openstack/nova: Xen Storage Manager Volume Driver https://review.openstack.org/897 | 01:25 |
| *** nhubbard is now known as nhubbard_away | 01:28 | |
| *** nati2 has quit IRC | 01:35 | |
| *** jdurgin has quit IRC | 01:39 | |
| *** jakedahn has quit IRC | 01:45 | |
| *** dak has quit IRC | 01:51 | |
| *** rods has quit IRC | 02:15 | |
| *** novas0x2a|laptop has quit IRC | 02:24 | |
| *** adjohn has quit IRC | 02:49 | |
| *** dtroyer has joined #openstack-dev | 03:05 | |
| *** dtroyer has quit IRC | 03:09 | |
| openstackgerrit | Todd Willey proposed a change to openstack/nova: Build metadata as needed through callbacks. https://review.openstack.org/809 | 03:40 |
| *** jakedahn has joined #openstack-dev | 03:56 | |
| *** martine_ has quit IRC | 03:57 | |
| *** jakedahn has quit IRC | 03:59 | |
| *** zaitcev has quit IRC | 04:25 | |
| *** adjohn has joined #openstack-dev | 04:47 | |
| *** tsuzuki_ has joined #openstack-dev | 05:35 | |
| *** tsuzuki_ has quit IRC | 05:36 | |
| *** adjohn has quit IRC | 06:42 | |
| *** hugokuo has joined #openstack-dev | 06:50 | |
| *** toluene has joined #openstack-dev | 06:50 | |
| *** Oneiroi has joined #openstack-dev | 07:26 | |
| *** Oneiroi has joined #openstack-dev | 07:26 | |
| *** toluene has quit IRC | 07:34 | |
| *** misheska has quit IRC | 08:44 | |
| *** Oneiroi has quit IRC | 09:06 | |
| *** Oneiroi has joined #openstack-dev | 09:49 | |
| *** Oneiroi has quit IRC | 10:00 | |
| *** toluene has joined #openstack-dev | 10:11 | |
| *** toluene has quit IRC | 10:15 | |
| *** hugokuo has quit IRC | 10:24 | |
| *** jakedahn has joined #openstack-dev | 10:32 | |
| *** toluene has joined #openstack-dev | 10:37 | |
| *** jakedahn has quit IRC | 10:47 | |
| *** toluene has quit IRC | 10:58 | |
| *** Oneiroi has joined #openstack-dev | 11:05 | |
| *** Oneiroi has joined #openstack-dev | 11:05 | |
| *** Oneiroi has quit IRC | 11:12 | |
| *** Oneiroi has joined #openstack-dev | 11:30 | |
| *** Oneiroi has quit IRC | 11:40 | |
| *** Oneiroi has joined #openstack-dev | 11:45 | |
| *** lorin1 has joined #openstack-dev | 11:46 | |
| *** Vek has quit IRC | 12:41 | |
| *** reed has quit IRC | 13:10 | |
| *** Oneiroi has quit IRC | 13:26 | |
| *** toluene has joined #openstack-dev | 13:52 | |
| *** Spirilis has quit IRC | 13:55 | |
| *** toluene has quit IRC | 14:06 | |
| *** lorin1 has quit IRC | 14:22 | |
| *** rods has joined #openstack-dev | 14:28 | |
| *** Vek has joined #openstack-dev | 14:41 | |
| *** reed has joined #openstack-dev | 15:02 | |
| *** reed has quit IRC | 15:12 | |
| *** zul has quit IRC | 15:21 | |
| *** zul has joined #openstack-dev | 15:21 | |
| openstackgerrit | Mark McLoughlin proposed a change to openstack/nova: Chain up to superclass tearDown in ServerActionsTest https://review.openstack.org/898 | 15:25 |
| *** vladimir3p has joined #openstack-dev | 15:55 | |
| *** rods has quit IRC | 15:55 | |
| openstackgerrit | Mark McLoughlin proposed a change to openstack/nova: Remove unused flag_overrides from TestCase https://review.openstack.org/899 | 15:55 |
| *** ziyadb has joined #openstack-dev | 16:17 | |
| *** ziyadb has quit IRC | 16:39 | |
| *** ziyadb has joined #openstack-dev | 16:46 | |
| *** Oneiroi has joined #openstack-dev | 17:12 | |
| *** ziyadb has quit IRC | 17:22 | |
| *** bengrue has joined #openstack-dev | 18:00 | |
| openstackgerrit | Mark McLoughlin proposed a change to openstack/nova: Start switching from gflags to optparse https://review.openstack.org/900 | 18:05 |
| *** lorin1 has joined #openstack-dev | 18:12 | |
| *** vladimir3p has quit IRC | 18:17 | |
| *** vladimir3p has joined #openstack-dev | 18:18 | |
| *** sdake has quit IRC | 18:32 | |
| *** lorin1 has quit IRC | 18:34 | |
| *** lorin1 has joined #openstack-dev | 19:05 | |
| *** bengrue has quit IRC | 19:08 | |
| *** Oneiroi has quit IRC | 20:04 | |
| *** novas0x2a|laptop has joined #openstack-dev | 20:14 | |
| *** Oneiroi has joined #openstack-dev | 20:16 | |
| *** Oneiroi has joined #openstack-dev | 20:16 | |
| *** blamar has quit IRC | 20:47 | |
| *** blamar has joined #openstack-dev | 20:50 | |
| *** vladimir3p has quit IRC | 20:55 | |
| *** rods has joined #openstack-dev | 21:01 | |
| *** mdomsch has quit IRC | 21:01 | |
| openstackgerrit | Marcelo Martins proposed a change to openstack/swift: adding the first batch of swift manpages for review https://review.openstack.org/856 | 22:08 |
| *** Oneiroi has quit IRC | 22:18 | |
| *** lorin1 has quit IRC | 22:47 | |
| *** toluene has joined #openstack-dev | 23:16 | |
| *** rkukura has joined #openstack-dev | 23:17 | |
| *** toluene has quit IRC | 23:29 | |
| *** rkukura has quit IRC | 23:35 | |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!