updating with new git commands

This commit is contained in:
Philip Sargent 2020-04-23 01:12:51 +01:00
parent fc25e1cb5e
commit ac1affc097

View File

@ -98,16 +98,17 @@ repository. To properly finish the job you need to get a nerd to
<li>
ssh into expo@expo.survex.com from a machine already configured to do this
<li>cd to the directory containing the repo you want, i.e. "cd expoweb" for the handbook, which takes you to /home/expo/expoweb
<li>Run "<a href="https://www.selenic.com/mercurial/hg.1.html">hg status</a>" (to check what
<li>Run "<a href="https://git-scm.com/book/en/v2/Getting-Started-Getting-Help">git status</a>" (to check what
changes are pending),
<li>then "<a href="https://www.selenic.com/mercurial/hg.1.html">hg diff</a>" to see the changes in detail
(or "hg diff|less" if you know how to use "less") and
<li>then DO NOT just run '<a href="https://www.selenic.com/mercurial/hg.1.html">hg commit</a>' unless you know how <em>emacs</em> works as it would dump
<li>then "<a href="https://git-scm.com/book/en/v2/Getting-Started-Getting-Help">git add</li>a> <em>filename</em>em>
</em>" to stage the page you have just edited.
<li>then DO NOT just run '<a href="https://git-scm.com/book/en/v2/Getting-Started-Getting-Help">
git commit</a>' unless you know how <em>emacs</em> works as it would dump
you into an emacs editing window (C-x C-C is the way to exit emacs). Instead, use the "-m" option:
<code>hg commit -m "changed topcamp phone number - myName" </code>
<code>git commit -m "changed topcamp phone number - myName" </code>
which submits the obligatory comment with the commit operation. You should write something informative and brief about your changes between the quotation marks and also give your full name.
</ul>
<p>We intend to make this issue go away when we migrate the expoweb repo from mercurial to git during 2020.
<p>We hope to make this issue go away by integrating triggers, but it is a low priority (April 2020).
<hr />
<p>Go on to <a href="hbmanual2.html">Editing several pages</a><br />
Return to <a href="onlinesystems.html">Online systems overview</a>