expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-29 05:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase option - online edit of handbook/computing/qstart-git.html

Browse Source
This commit is contained in:
Philip Sargent 2022-07-23 12:36:39 +01:00
parent 4a32a5e94c
commit 138ed03920
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
handbook/computing/qstart-git.html
View File

@ -38,6 +38,15 @@
<dt>troggle</dt><dd>This is the python code that runs troggle and generates 2,000 webpages of reports and tables. This is what you need for software development.<tt>git clone ssh://expo@expo.survex.com:troggle</tt> (read/write)</dd>
</dl>
<h3>git use on your machine</h3>
<p>It's much neater to do
<tt>git fetch; git rebase origin master</tt>
than
<tt>git pull;</tt> which is equivalent to <tt>git fetch; git merge</tt>
when you have a local change and there are changes on the server. The rebase command
gives a nice linear log rather than trivial merges.
<p>In VS code there is a "Pull (rebase)" command accessed from the "Push, Pull" option in the pull-down menu "..." in the SOURCE CONTROL window. Use that instead of the "Pull" option which is more obvious.
<h3>Using git</h3>
<p>In Git, there are five places your source can exist: <ul>
<li>a stash,