53 lines
3.4 KiB
Markdown
53 lines
3.4 KiB
Markdown
# Git and Subversion
|
|
|
|
## Commit
|
|
|
|
The **Commit** window (`Alt+0`, `Ctrl+K`): changed and unversioned files with check boxes, the message, **Amend**, Commit, **Commit and
|
|
Push** (`Ctrl+Alt+K`). Double click a file: its diff with HEAD (`Ctrl+D`). **Rollback File…** (`Ctrl+Alt+Z`). **Stage by Change…**:
|
|
a file's hunks one at a time.
|
|
|
|
## Update, push, branches
|
|
|
|
- **Update Project** (`Ctrl+T`): pull. **Push…** (`Ctrl+Shift+K`), with `--force-with-lease` when asked.
|
|
- **Branches…** (the branch of the tool bar, Ctrl+Shift+backquote): checkout, new, merge, rename, delete (also on the server).
|
|
- In a merge, **By block…**: each conflict, ours, theirs or both.
|
|
|
|
## Log and history
|
|
|
|
The **Git** window (`Alt+9`): the log with the branches' graph, the files of each commit and their diff. Right click a commit: new
|
|
branch, tag, cherry-pick, revert, reset (soft / mixed / hard). **Show History of the File**, **Annotate with Git Blame**.
|
|
|
|
## Other dialogs
|
|
|
|
Git Remotes… (add, change, remove), Git Tags… (make, push, delete), Git Stashes… (apply, pop, drop), Git Submodules…, **SSH Keys…**
|
|
(the keys of `~/.ssh`, generate ed25519, copy the public key, test `ssh -T`), **Git Credentials…** (a user and a token for any https
|
|
host; GitHub comes from the jumphp.net sign-in). When git cannot sign in, a message says what to do.
|
|
|
|
## Subversion
|
|
|
|
A Subversion working copy works beside Git: the Commit window, diff with BASE, log, annotate, update, conflicts, switch, checkout.
|
|
|
|
## Version control of the project, and where it lives
|
|
|
|
The branch widget of the tool bar (it reads **No version control** in a plain folder), **Settings > Version control** and the Git menu
|
|
(**Version control…**, **Remotes and hosting…**) choose what the IDE uses for the project:
|
|
|
|
- **Git**: **Initialise Git here** (`git init`, nothing committed), or **Use Git** when a `.git` folder is already there.
|
|
- **Subversion**: **Check out a repository…** into the project folder (`svn checkout --force`: the files already there stay as local
|
|
changes, nothing is committed), or **Use Subversion** for an existing working copy.
|
|
- **None** (**Detach**): the IDE stops showing Git / Subversion. `.git` and `.svn` and the history are **not touched**. Only if you tick
|
|
"Also delete the folder" **and** type `DELETE` are they deleted (your project files never are).
|
|
|
|
The choice is kept in `.jumphp/vcs.json` (never committed).
|
|
|
|
**Remotes and hosting…** lists the remotes with their host (JumPHP forge git.jumphp.net, GitHub, GitLab gitlab.com or your own server,
|
|
Bitbucket, another URL); add, change or remove one, **Test connection** (`git ls-remote`, or `svn info` for Subversion: bounded in time,
|
|
never asks a question, the frame is never blocked). A Subversion project shows its repository URL (change it with `svn relocate`).
|
|
**Add a token…** keeps a personal access token for a host in the IDE's Git credentials (never in the project, never in a URL).
|
|
|
|
### The Source control step of New Project
|
|
|
|
Every New Project form (games, apps, CLI, plugin, extension, Chrome extension, web site) has a **Source control** step:
|
|
**Git, local only** (default), **Git and a repository on a host** (JumPHP forge by default, GitHub or GitLab; private by default;
|
|
or an existing remote URL, only added as `origin`), **Subversion** (checkout of an existing repository) or **No version control**.
|
|
If the host needs a token the IDE has not got, a field asks for it (password field) before anything is made.
|