You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by remibergsma <gi...@git.apache.org> on 2015/12/12 11:25:34 UTC
[GitHub] cloudstack pull request: Show actual diff in commits after merge w...
GitHub user remibergsma opened a pull request:
https://github.com/apache/cloudstack/pull/1227
Show actual diff in commits after merge with git-pr / git-fwd-merge
This shows the diff in commits after using `git-pr` and `git-fwd-merge` tools, like this:
```
44e8c92 Merge pull request #1226 from borisroman/CLOUDSTACK-9148
0554610 Removed .pydevproject from plugin kvm hypervisor.
```
That helps in quickly seeing what change is applied and whether it makes sense. It doesn't touch the actual code base. I'm using this patch for some time already.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/remibergsma/cloudstack git-pr-show-commits
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1227.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1227
----
commit 52edbbb6cc2e2c58e360b737143c10adddc43880
Author: Remi Bergsma <gi...@remi.nl>
Date: 2015-12-12T10:00:41Z
Show actual diff in commits after merge
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: Show actual diff in commits after merge w...
Posted by borisroman <gi...@git.apache.org>.
Github user borisroman commented on the pull request:
https://github.com/apache/cloudstack/pull/1227#issuecomment-164146356
Nice! LGTM :+1:
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: Show actual diff in commits after merge w...
Posted by remibergsma <gi...@git.apache.org>.
Github user remibergsma commented on the pull request:
https://github.com/apache/cloudstack/pull/1227#issuecomment-164138076
Example of merging PR 1221:
<img width="1253" alt="screen shot 2015-12-12 at 11 30 22" src="https://cloud.githubusercontent.com/assets/1630096/11761460/05e97f22-a0c4-11e5-8c4a-da8cf67c973e.png">
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: Show actual diff in commits after merge w...
Posted by wilderrodrigues <gi...@git.apache.org>.
Github user wilderrodrigues commented on the pull request:
https://github.com/apache/cloudstack/pull/1227#issuecomment-164139213
Cool! Also nice you put the screenshot to show it in action.
LGTM
Cheers,
Wilder
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: Show actual diff in commits after merge w...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/cloudstack/pull/1227
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: Show actual diff in commits after merge w...
Posted by DaanHoogland <gi...@git.apache.org>.
Github user DaanHoogland commented on the pull request:
https://github.com/apache/cloudstack/pull/1227#issuecomment-164147061
LGTM, this is why we want to be merging code instead of rebasing, no more commits on master! only merges!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---