Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 966d0ee3f255
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 74b96016446e
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 14, 2015

  1. doc: add precision about Git commit management

    @sbourdeauducq
    sbourdeauducq committed Aug 14, 2015
    Copy the full SHA
    12b3157 View commit details

  2. Merge branch 'master' of github.com:m-labs/artiq

    @sbourdeauducq
    sbourdeauducq committed Aug 14, 2015
    Copy the full SHA
    13439c6 View commit details

  3. Merge branch 'master' of github.com:m-labs/artiq

    @sbourdeauducq
    sbourdeauducq committed Aug 14, 2015
    Copy the full SHA
    74b9601 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 doc/manual/management_system.rst
2 changes: 1 addition & 1 deletion doc/manual/management_system.rst
View file
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ You may now run the master with the Git support enabled: ::

Push commits containing experiments to the bare repository using e.g. Git over SSH, and the new experiments should automatically appear in the GUI.

.. note:: If you plan to run the ARTIQ system entirely on a single machine, you may also consider using a non-bare repository and the ``post-commit`` hook to trigger repository scans every time you commit changes (locally). The ARTIQ master never uses the repository's working directory, but only what is committed.
.. note:: If you plan to run the ARTIQ system entirely on a single machine, you may also consider using a non-bare repository and the ``post-commit`` hook to trigger repository scans every time you commit changes (locally). The ARTIQ master never uses the repository's working directory, but only what is committed. More precisely, it fetches by default the last (atomically) completed commit at the time of experiment submission and checks it out in a temporary folder (which solves the problem of concurrent repository access).

The GUI always runs experiments from the repository. The command-line client, by default, runs experiment from the raw filesystem (which is useful for iterating rapidly without creating many disorganized commits). If you want to use the repository instead, simply pass the ``-R`` option.