- 1 Introduction
- 2 Initialization
- 3 Adding and Committing
- 4 Branches
- 5 Comparing and merging
- 6 Informations
- 7 Not implemented
The plugin provides git-functionality for testsuites.
For proper work you need a remote-repository and access to it without entering user name and password. For configuration you have to set user name and mail-address in the expecco-configuration (see Settings GitSettings/en).
The git-functionality will not work, if you use sub-directories in your project. The .git-directory must be in the same directory as your files of the testsuites.
In Case of an Error
Before executing a git-command, that affects your testsuite-files, a copy of these files will be created. They become the suffix "<testsuite>.last.sav".
Provides the functionality of 'git clone': Cloning a repository into a a new local directory. A dialog boxes ask for the url of the remote repository and the root directory of your projects.
Executed git-command: git clone <repository-url>.
Adding and Committing
Before you can commit your new or changed testsuite, you have add the file to the git index.
Executed git-command: git add <testsuite>.
Removes an added testsuite from index. It is still modified, but not destined for commit.
Executed git-command: git reset HEAD <testsuite>
Add All and Commit...
Adds all modified files and commits them in one step. You will be asked for entering a commit message. An empty commit message is not allowed.
Executed git-command: git commit -a -m "<commit message>"
Commits all added files. A message-box will appear to enter the commit message. An empty commit message is not allowed.
Executed git-command: git commit -m "<commit message>"
Replace the tip of the current branch by creating a new commit with a new commit message. The new commit has the same parents and author as the current one.
You should understand the implications of rewriting history if you amend a commit that has already been published!
Executed git-command: git commit --amend.
Discard changes in working directory
Discards the changes since the last commit. Attention: Your changes are lost!
If you get conflicts by changing the branch, because of uncommitted changes in some of your files, you can discard or commit your changes.
Executed git-command: git checkout -- <testsuite>.
Create Local Branch...
Creates a new local branch with a given name.
Executed git-command: git checkout -b <branch>.
Delete Local Branch...
Deletes a local branch.
The branch must be merged into the current branch. Otherwise the deletion will be refused.
Executed git-command: git branch -d <branch>.
Checks out a branch. In a dialog box you can choose the desired branch.
If you have uncommitted changes, git rejects the checkout of the new branch. You can discard or commit your changes (see above) and try again.
Executed git-command: git checkout <branch>.
To publish your commits to the remote-repository you have to push it.
Executed git-command: git push.
Incorporates changes from the remote repository into the current branch.
Because automatically merge by git isn't possible in any case, you can get merge-conflicts. To avoid this, better use Merge.
If you get unresolvable conflicts, you can reset the files wit Merge Abort after Conflict and try again with Merge.
Executed git-command: git pull.
Comparing and merging
Downloads objects and refs from the remote repository, but don't change the local files.
Executed git-command: git fetch.
Merges with HEAD of the current branch. (Only possible on remote-branches.)
You get the newest version of the current branch from the repository with the changes done by others. If there exists differences that cannot merged automatically between the two version the Expecco-ProjectDifferenceBrowser will open and you can take over your changes.
Executed git-command: git fetch git merge
Merge with Branch...
Merges the contents from another branch, you select in a dialog box, to your testsuites.
Executed git-command: git fetch git merge <branch>
You can finish a manually merge with a final 'Merge Commit. You maybe override changes from others.
This functionality you doesn't need usually. It is integreted in the merge commands above.
Executed git-command: git commit -a --no-edit
Merge Abort after Conflict
If you have unresolvable conflicts after pulling, you can abort the merge. You can retry the merge with Merge.
Executed git-command: git merge --abort
Displays a dialog box with the commit log of the current branch.
Executed git-command: git log
Shows the working tree status.
Executed git-command: git status
Current state in the window status line
After every git command, the state of then working tree will be displayed in the status line of the expecco window.
- added: new file added.
- modified: file modified, not added
- staged: file modified and added
- deleted: file deleted
- renamed: file renamed
- unmerged: file not merged
- unknown: new file, not added
- ignored: file ignored (settings in .gitignore)
- name of the branch
- ahead: your working copy is ahead the remote copy: you can push your commits.
- behind: your working copy is behind the remote copy. You can pull to get the changes.
- ahead / behind: your branch has deverged. You have to merge.
- Use of the git-stash command.