ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix typesetting issues

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-02-22 13:50:15 -05:00
parent ca650ba43f
commit cdf795652a
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
doc/src/Howto_github.rst
View File

@ -144,22 +144,23 @@ After everything is done, add the files to the branch and commit them:
.. code-block:: bash .. code-block:: bash
$ git add doc/src/Howto_github.txt $ git add doc/src/Howto_github.txt
$ git add doc/src/JPG/tutorial\*.png $ git add doc/src/JPG/tutorial*.png
.. warning:: .. warning::
Do not use *git commit -a* (or *git add -A*\ ). The -a Do not use *git commit -a* (or *git add -A*\ ). The -a flag (or -A
flag (or -A flag) will automatically include \_all\\_ modified or new files flag) will automatically include **all** modified **and** new files
and that is rarely the behavior you want. It can easily lead to and that is rarely the behavior you want. It can easily lead to
accidentally adding unrelated and unwanted changes into the repository. accidentally adding unrelated and unwanted changes into the
Instead it is preferable to explicitly use *git add*\ , *git rm*\ , *git mv* repository. Instead it is preferable to explicitly use *git add*\ ,
for adding, removing, renaming individual files, respectively, and then *git rm*\ , *git mv* for adding, removing, renaming individual files,
*git commit* to finalize the commit. Carefully check all pending respectively, and then *git commit* to finalize the commit.
changes with *git status* before committing them. If you find doing Carefully check all pending changes with *git status* before
this on the command line too tedious, consider using a GUI, for example committing them. If you find doing this on the command line too
the one included in git distributions written in Tk, i.e. use *git gui* tedious, consider using a GUI, for example the one included in git
(on some Linux distributions it may be required to install an additional distributions written in Tk, i.e. use *git gui* (on some Linux
package to use it). distributions it may be required to install an additional package to
use it).
After adding all files, the change set can be committed with some After adding all files, the change set can be committed with some
useful message that explains the change. useful message that explains the change.
@ -411,7 +412,7 @@ we need to pull Axel's change back into our branch, and merge them:
.. code-block:: bash .. code-block:: bash
$ git add Howto_github.txt $ git add Howto_github.txt
$ git add JPG/tutorial_reverse_pull_request\*.png $ git add JPG/tutorial_reverse_pull_request*.png
$ git commit -m "Updated text and images on reverse pull requests" $ git commit -m "Updated text and images on reverse pull requests"
$ git pull $ git pull