ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject incubator-ponymail-site git commit: s/code/pre/
Date Tue, 31 May 2016 13:03:02 GMT
Repository: incubator-ponymail-site
Updated Branches:
  refs/heads/asf-site e8bb1e1c6 -> fad5d6055


s/code/pre/


Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/commit/fad5d605
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/tree/fad5d605
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/diff/fad5d605

Branch: refs/heads/asf-site
Commit: fad5d60554f522bd388680d9a28f4bed20f73d99
Parents: e8bb1e1
Author: humbedooh <humbedooh@apache.org>
Authored: Tue May 31 15:02:50 2016 +0200
Committer: humbedooh <humbedooh@apache.org>
Committed: Tue May 31 15:02:50 2016 +0200

----------------------------------------------------------------------
 content/contribute.html       | 14 ++++++++++----
 source/markdown/contribute.md | 11 ++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/fad5d605/content/contribute.html
----------------------------------------------------------------------
diff --git a/content/contribute.html b/content/contribute.html
index c66855d..a2fa5f0 100644
--- a/content/contribute.html
+++ b/content/contribute.html
@@ -86,15 +86,21 @@ for the reviewer to focus only in the last changes without having to go
 again through the entire pull request. Once the PR is ready to be
 merged, you'll be asked to squash the commits. Preparing the pull
 request to be merged</p>
-<p>First squash the commits, to have a cleaner rebase (it is easier to rebase having
one single commit than having N commits):
-<code>git rebase -i HEAD~N     # Where N is the number of commits in the pull request</code></p>
+<p>First squash the commits, to have a cleaner rebase (it is easier to rebase having
one single commit than having N commits):</p>
+<pre>
+git rebase -i HEAD~N     # Where N is the number of commits in the pull request
+</pre>
+
 <p>Now that there is only one commit, update the branch to the latest version of master:
 <pre>
 git fetch ponymail
 git rebase ponymail/master
 </pre></p>
-<p>At this point the local branch with one single commit on top of the latest master
and it can be pushed to your fork:</p>
-<p><code>git push &lt;your-fork's-remote&gt; feature-branch -f   # You
might need to push with --force because of the rebase to the latest master</code></p>
+<p>At this point the local branch with one single commit on top of the latest master
and it can be pushed to your fork:
+<pre>
+git push <your-fork's-remote> feature-branch -f # You might need to push with --force
+                                                # because of the rebase to the latest master
+</pre></p>
 <p>Now the pull request will be clean with one single commit and up to date
 with the latest master. Ready to be merged!</p>
 <h4>A note about keeping the pull request up to date</h4>

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/fad5d605/source/markdown/contribute.md
----------------------------------------------------------------------
diff --git a/source/markdown/contribute.md b/source/markdown/contribute.md
index 2852d04..664147b 100644
--- a/source/markdown/contribute.md
+++ b/source/markdown/contribute.md
@@ -53,7 +53,10 @@ merged, you'll be asked to squash the commits. Preparing the pull
 request to be merged
 
 First squash the commits, to have a cleaner rebase (it is easier to rebase having one single
commit than having N commits):
-`git rebase -i HEAD~N     # Where N is the number of commits in the pull request`
+
+~~~
+git rebase -i HEAD~N     # Where N is the number of commits in the pull request
+~~~
 
 Now that there is only one commit, update the branch to the latest version of master:
 ~~~
@@ -62,8 +65,10 @@ git rebase ponymail/master
 ~~~
 
 At this point the local branch with one single commit on top of the latest master and it
can be pushed to your fork:
-
-`git push <your-fork's-remote> feature-branch -f   # You might need to push with --force
because of the rebase to the latest master`
+~~~
+git push <your-fork's-remote> feature-branch -f # You might need to push with --force
+                                                # because of the rebase to the latest master
+~~~
 
 Now the pull request will be clean with one single commit and up to date
 with the latest master. Ready to be merged!


Mime
View raw message