GIT Plugin/en - Versionsgeschichte

Alkurz: /* Delete Local Branch... */

2022-03-17T14:35:36Z

Delete Local Branch...

← Nächstältere Version		Version vom 17. März 2022, 14:35 Uhr
Zeile 79:		Zeile 79:

	Executed git-command: ''git branch -d <branch>''.		Executed git-command: ''git branch -d <branch>''.


	=== Checkout Branch... ===		=== Checkout Branch... ===

Cg: /* Discard changes in working directory */

2019-12-07T13:55:40Z

Discard changes in working directory

← Nächstältere Version		Version vom 7. Dezember 2019, 13:55 Uhr
Zeile 56:		Zeile 56:
	Executed git-command: ''git commit --amend''.		Executed git-command: ''git commit --amend''.

	=== Discard ~~changes~~ in ~~working~~ ~~directory~~ ===		=== Discard Changes in Working Directory ===

	Discards the changes since the last commit. Attention: Your changes are lost!		Discards the changes since the last commit. Attention: Your changes are lost!
Zeile 63:		Zeile 63:

	Executed git-command: ''git checkout -- <testsuite>''.		Executed git-command: ''git checkout -- <testsuite>''.


	== Branches ==		== Branches ==

Cg: /* Comparing and merging */

2019-12-07T13:55:19Z

Comparing and merging

← Nächstältere Version		Version vom 7. Dezember 2019, 13:55 Uhr
Zeile 106:		Zeile 106:


	== Comparing and ~~merging~~ ==		== Comparing and Merging ==

	=== Fetch ===		=== Fetch ===
Zeile 144:		Zeile 144:

	Executed git-command: ''git merge --abort''		Executed git-command: ''git merge --abort''


	== Information ==		== Information ==

Cg: /* Informations */

2019-12-07T13:54:54Z

Informations

← Nächstältere Version		Version vom 7. Dezember 2019, 13:54 Uhr
Zeile 146:		Zeile 146:


	== ~~Informations~~ ==		== Information ==

	=== Show Log ===		=== Show Log ===
Zeile 178:		Zeile 178:
	* behind: your working copy is behind the remote copy. You can pull to get the changes.		* 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.		* ahead / behind: your branch has deverged. You have to merge.




	== Not implemented ==		== Not implemented ==

Cg: /* Precondition */

2019-12-07T13:54:26Z

Precondition

← Nächstältere Version		Version vom 7. Dezember 2019, 13:54 Uhr
Zeile 6:		Zeile 6:

	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]]).		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]]).
		⚫	<br>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.

⚫	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 ===		=== In Case of an Error ===

Cg: /* In Case of an Error */

2019-12-07T13:54:09Z

In Case of an Error

← Nächstältere Version		Version vom 7. Dezember 2019, 13:54 Uhr
Zeile 11:		Zeile 11:
	=== In Case of an Error ===		=== In Case of an Error ===

	Before executing a git-command, ~~that~~ affects your testsuite-files, a copy of ~~these~~ files will be created. They get the suffix "<testsuite>.last.sav".		Before executing any git-command, which affects your testsuite-files, a copy of those files will be created. They get the suffix "<testsuite>.last.sav".

	== Initialization ==		== Initialization ==

Cg: /* In Case of an Error */

2019-11-01T13:06:12Z

In Case of an Error

← Nächstältere Version		Version vom 1. November 2019, 13:06 Uhr
Zeile 11:		Zeile 11:
	=== In Case of an Error ===		=== 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".		Before executing a git-command, that affects your testsuite-files, a copy of these files will be created. They get the suffix "<testsuite>.last.sav".


	== Initialization ==		== Initialization ==

Alkurz am 1. August 2019 um 12:09 Uhr

2019-08-01T12:09:11Z

@@ Zeile 148: / Zeile 148: @@
-== Status information ==
+== Informations ==
 === Show Log ===
@@ Zeile 161: / Zeile 161: @@
   Executed git-command: ''git status''

Alkurz am 1. August 2019 um 10:40 Uhr

2019-08-01T10:40:32Z

← Nächstältere Version		Version vom 1. August 2019, 10:40 Uhr
Zeile 3:		Zeile 3:
	The plugin provides git-functionality for testsuites.		The plugin provides git-functionality for testsuites.

			=== Precondition ===

		⚫	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]]).
⚫	Before ~~starting~~ a git-command, that affects your testsuite-files, a copy of these files will be created. They become the suffix ".last.sav".

	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.		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.

	=== ~~Precondition~~ ===		=== 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".
⚫	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]]).


Zeile 18:		Zeile 19:

	Provides the functionality of 'git clone': Cloning a repository into a a new local directory.		Provides the functionality of 'git clone': Cloning a repository into a a new local directory.
	A dialog ~~box~~ ~~asks~~ for the url of the remote repository.		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>''.		Executed git-command: ''git clone <repository-url>''.


	== Adding and Committing ==		== Adding and Committing ==

	=== Add ===		=== Add ===

	Before you can commit your new or changed testsuite, you have add the file to the git index.		Before you can commit your new or changed testsuite, you have add the file to the git index.

	Executed git-command: ''git add <testsuite>''.		Executed git-command: ''git add <testsuite>''.
	<!-- git add: Add file contents to the index -->

	=== Unstage ===		=== Unstage ===
Zeile 38:		Zeile 40:
	=== Add All and Commit... ===		=== Add All and Commit... ===

	Adds all modified files and commits them in one step. You will be asked for entering a commit-message.		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>"''		Executed git-command: ''git commit -a -m "<commit message>"''

	=== Commit.. ===		=== Commit.. ===

	Commits all added files. A message-box will appear to enter the commit-message. An empty commit-message is not allowed.		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>"''		Executed git-command: ''git commit -m "<commit message>"''

	=== Commit (amend) ===		=== Commit (amend) ===

	Replace the tip of the current branch by creating a new commit. The new commit has the same parents and author as the current one.		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!		You should understand the implications of rewriting history if you amend a commit that has already been published!
Zeile 58:		Zeile 60:
	=== Discard changes in working directory ===		=== 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 ~~the~~ changes.

		⚫	If you get conflicts by changing the branch, because of uncommitted changes in some of your files, you can discard or commit your changes.
⚫	Attention: Your changes are lost!

	The other possibility is to commit your changes.

	Executed git-command: ''git checkout -- <testsuite>''.		Executed git-command: ''git checkout -- <testsuite>''.
Zeile 87:		Zeile 87:
	Checks out a branch. In a dialog box you can choose the desired 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 ~~(see below)~~ or commit your changes and try again.		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>''.		Executed git-command: ''git checkout <branch>''.
Zeile 93:		Zeile 93:
	=== Push ===		=== Push ===

	To publish your ~~test-suites~~ to the remote-repository you have to push it.		To publish your commits to the remote-repository you have to push it.

	Executed git-command: ''git push''.		Executed git-command: ''git push''.
Zeile 101:		Zeile 101:
	Incorporates changes from the remote repository into the current branch.		Incorporates changes from the remote repository into the current branch.

	Because automatically merge by git isn't ~~possibly~~, 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'''''.~~		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''.		Executed git-command: ''git pull''.
Zeile 119:		Zeile 121:
	Merges with HEAD of the current branch. (Only possible on remote-branches.)		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 ~~not~~ ~~automatically~~ ~~mergeable~~ ~~differences~~ between the two version the ''Expecco-ProjectDifferenceBrowser'' will open and you can take over your changes.		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''		Executed git-command: ''git fetch''
Zeile 127:		Zeile 129:

	Merges the contents from another branch, you select in a dialog box, to your testsuites.		Merges the contents from another branch, you select in a dialog box, to your testsuites.

	This command doesn't change the branch in your working directory.

	Executed git-command: ''git fetch''		Executed git-command: ''git fetch''
Zeile 135:		Zeile 135:
	=== Merge Commit ===		=== Merge Commit ===

	You can finish ~~the~~ merge with a final '''Merge Commit''. You maybe override changes from others.		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''		Executed git-command: ''git commit -a --no-edit''
Zeile 162:		Zeile 164:

	== Not implemented ==		== Not implemented ==
	* Use of the git-stash-command.		* Use of the git-stash command.

Alkurz am 1. August 2019 um 09:56 Uhr

2019-08-01T09:56:39Z

← Nächstältere Version		Version vom 1. August 2019, 09:56 Uhr
Zeile 3:		Zeile 3:
	The plugin provides git-functionality for testsuites.		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.

	Before starting a git-command, that affects your testsuite-files, a copy of these files will be created. They become the suffix ".last.sav".		Before starting a git-command, that affects your testsuite-files, a copy of these files will be created. They become the suffix ".last.sav".
Zeile 9:		Zeile 8:
	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.		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.

			=== Precondition ===

		⚫	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]]).
⚫	== Initialization ==

	=== Configuration ===

		⚫	== Initialization ==
	Sets the global git parameters for user name and mail-address in the [[[Datei:http://www.example.com Link-Text]]].

	Executed git-command: ''git config --global user.name=<user name>'',
	''git config --global user.email=<mail address>''.

	=== Clone ~~a repository~~ ===		=== Clone ===

	Provides the functionality of 'git clone': Cloning a repository into a a new local directory.		Provides the functionality of 'git clone': Cloning a repository into a a new local directory.
Zeile 166:		Zeile 162:

	== Not implemented ==		== Not implemented ==
	* Drop branches.
	* Use of the git-stash-command.		* Use of the git-stash-command.