Comment 7 for bug 1671506

Revision history for this message
Fulvio Galeazzi (fulvio-galeazzi) wrote : Re: [Bug 1671506] Re: Extend Keystone to cope with OIDC and Identity Federations

Hallo James,
    sorry for being so ignorant with Git... I'd like to commit my changes
for review.

Here is the current status:

maastest@xenial-juju:~/Users/fulvio/localcharms/charm-keystone$ git status
On branch bug/1671506
nothing to commit, working directory clean

maastest@xenial-juju:~/Users/fulvio/localcharms/charm-keystone$ git superlog
* 1b908ee82b8cc3ada6d4f2a29fffc6f4d6cc2261 (HEAD -> bug/1671506) Merge
remote-tracking branch 'origin/master' into bug/1671506
|\
| | * 3d84a3563ab80169cf97f552e94651f873d3abb2 (master) Merge
remote-tracking branch 'origin/master'
| | |\
| |/ /
|/| /
| |/
| * 681047f39777c5700bccab360bc1615c74150c94 (origin/master, origin/HEAD,
gerrit/master) Use 'uuid' token provide configuration
| * 6f99e78cdeebfe93ea8343848a8e17f44736e79b Updated icon
| * d36af554846fcd37368b3c7e09bdc19649b7ac46 Updates for pike b1
| * d62a2e75c3efb52d5e6a6d176c0c12a2cb263358 Network space aware address
for cluster relation
| * 8b066b7eabf24f4aeacf74492bcac6575c0292ab Merge "Enable Zesty-Ocata
Amulet Tests"
......

Problem is that "git review" noticed I made several commits and asks:

maastest@xenial-juju:~/Users/fulvio/localcharms/charm-keystone$ git review
You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.

The outstanding commits are:

1b908ee (HEAD -> bug/1671506) Merge remote-tracking branch 'origin/master'
into bug/1671506
a67fd8c Related-Bug: 1671506
5b7797c Updated icon
e135c85 Updates for pike b1
......

Can you please suggest how should I move on from here? I am not familiar
with rebasing...
  Thanks!

    Fulvio