You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2017/03/28 12:22:52 UTC
cassandra git commit: Replaced non-ASCII command line in doc
Repository: cassandra
Updated Branches:
refs/heads/trunk 454b3f227 -> 380a614f1
Replaced non-ASCII command line in doc
patch by Jay Zhuang, reviewed by jasobrown for CASSANDRA-13374
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/380a614f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/380a614f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/380a614f
Branch: refs/heads/trunk
Commit: 380a614f1c10e34e456c428d9c3986991437b97f
Parents: 454b3f2
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Thu Mar 23 17:59:56 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Mar 28 05:22:02 2017 -0700
----------------------------------------------------------------------
doc/source/development/how_to_commit.rst | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/380a614f/doc/source/development/how_to_commit.rst
----------------------------------------------------------------------
diff --git a/doc/source/development/how_to_commit.rst b/doc/source/development/how_to_commit.rst
index d956c72..dff3983 100644
--- a/doc/source/development/how_to_commit.rst
+++ b/doc/source/development/how_to_commit.rst
@@ -31,15 +31,15 @@ On cassandra-3.0:
On cassandra-3.3:
#. ``git merge cassandra-3.0 -s ours``
#. ``git apply -3 12345-3.3.patch`` (likely to have an issue with CHANGES.txt here: fix it ourselves, then git add CHANGES.txt)
- #. ``git commit \u2014amend``
+ #. ``git commit -amend``
On trunk:
#. ``git merge cassandra-3.3 -s ours``
#. ``git apply -3 12345-trunk.patch`` (likely to have an issue with CHANGES.txt here: fix it ourselves, then git add CHANGES.txt)
- #. ``git commit \u2014amend``
+ #. ``git commit -amend``
On any branch:
- #. ``git push origin cassandra-3.0 cassandra-3.3 trunk \u2014atomic``
+ #. ``git push origin cassandra-3.0 cassandra-3.3 trunk -atomic``
Same scenario, but a branch-based contribution:
@@ -50,23 +50,23 @@ On cassandra-3.3:
#. ``git merge cassandra-3.0 -s ours``
#. ``git format-patch -1 <sha-of-3.3-commit>``
#. ``git apply -3 <sha-of-3.3-commit>.patch`` (likely to have an issue with CHANGES.txt here: fix it ourselves, then git add CHANGES.txt)
- #. ``git commit \u2014amend``
+ #. ``git commit -amend``
On trunk:
#. ``git merge cassandra-3.3 -s ours``
#. ``git format-patch -1 <sha-of-trunk-commit>``
#. ``git apply -3 <sha-of-trunk-commit>.patch`` (likely to have an issue with CHANGES.txt here: fix it ourselves, then git add CHANGES.txt)
- #. ``git commit \u2014amend``
+ #. ``git commit -amend``
On any branch:
- #. ``git push origin cassandra-3.0 cassandra-3.3 trunk \u2014atomic``
+ #. ``git push origin cassandra-3.0 cassandra-3.3 trunk -atomic``
.. tip::
Notes on git flags:
``-3`` flag to am and apply will instruct git to perform a 3-way merge for you. If a conflict is detected, you can either resolve it manually or invoke git mergetool - for both am and apply.
- ``\u2014atomic`` flag to git push does the obvious thing: pushes all or nothing. Without the flag, the command is equivalent to running git push once per each branch. This is nifty in case a race condition happens - you won\u2019t push half the branches, blocking other committers\u2019 progress while you are resolving the issue.
+ ``-atomic`` flag to git push does the obvious thing: pushes all or nothing. Without the flag, the command is equivalent to running git push once per each branch. This is nifty in case a race condition happens - you won\u2019t push half the branches, blocking other committers\u2019 progress while you are resolving the issue.
.. tip::