Schlagwort: git

Bitbucket

Wichtig:

NICHT:

git clone https://fenomedia@bitbucket.org/fenomedia/homepage-3d.gitCode-Sprache: PHP (php)

SONDERN:

git clone fenomedia@bitbucket.org:fenomedia/homepage-3d.git Code-Sprache: PHP (php)

SSH Authentifizierung

Install OpenSSH on macOS

A version of OpenSSH should be pre-installed on macOS. To check if OpenSSH is installed, open a terminal and run:

<code>ssh -V</code>Code-Sprache: HTML, XML (xml)

The output should show the installed version of OpenSSH.

To use Homebrew to install a newer version of OpenSSH, run:

<code>brew install openssh</code>Code-Sprache: HTML, XML (xml)

To check that OpenSSH was installed successfully, run:

<code>ssh -V</code>Code-Sprache: HTML, XML (xml)

The output should show the installed version of OpenSSH.

Start the SSH agent

To allow git to use your SSH key, an SSH agent needs to be running on your device.

To check if it is already running, run the ps command. If the ssh-agent is already running, it should appear in the output, such as:

<code>$ ps -a | grep ssh-agent </code>
<code>myusername 3291 0.0 0.0 6028 464 ? Ss 07:29 0:00 ssh-agent</code>Code-Sprache: HTML, XML (xml)

To start the agent, run:

<code>eval $(ssh-agent)</code>Code-Sprache: HTML, XML (xml)

You may need to add this command to your ~/.bashrc, ~/.zshrc, ~/.profile, or equivalent shell configuration file. Adding this command to a shell configuration file will ensure the agent is running when you open a terminal.

Create an SSH key pair

To create an SSH key pair:

• Open a terminal and navigate to your home or user directory using cd, for example:

<code>cd ~</code>Code-Sprache: HTML, XML (xml)

• Generate a SSH key pair using ssh-keygen, such as:

ssh-keygen -t ed25519 -b 4096 -C "{username@emaildomain.com}" -f {ssh-key-name}Code-Sprache: JavaScript (javascript)

• Where:
  • {username@emaildomain.com} is the email address associated with the Bitbucket Cloud account, such as your work email account.
  • {ssh-key-name} is the output filename for the keys. We recommend using a identifiable name such as bitbucket_work.
• When prompted to Enter passphrase, you can either provide a password or leave the password empty. If you input a password, you will be prompted for this password each time SSH is used, such as using Git command that contact Bitbucket Cloud (such as git push, git pull, and git fetch). Providing a password will prevent other users with access to the device from using your keys.

Once complete, ssh-keygen will output two files:

• {ssh-key-name} — the private key.
• {ssh-key-name}.pub — the public key.

Add your key to the SSH agent

To add the SSH key to your SSH agent (ssh-agent):

• Run the following command, replacing the {ssh-key-name} with the name of the private key:

ssh-add ~/{ssh-key-name}

• To ensure the correct SSH key is used when connecting to Bitbucket, update or create your SSH configuration file (~/.ssh/config) with the following settings:

Host bitbucket.org 
 AddKeysToAgent yes 
 IdentityFile ~/.ssh/{ssh-key-name}Code-Sprache: JavaScript (javascript)

• Where {ssh-key-name} is the location of the private key file once it has been added to the ssh-agent.

Provide Bitbucket Cloud with your public key

To add an SSH key to a Bitbucket repository:

1. At bitbucket.org, navigate to the repository and select Repository settings.
2. Under Security, select Access keys.
3. Select Add key.
4. In the Add SSH key dialog, provide a Label to help you identify which key you are adding. For example, Work Laptop <Manufacturer> <Model>. A meaning full label will help you identify old or unwanted keys in the future.
5. Open the public SSH key file (public keys have the .pub file extension) in a text editor. The public key should be in the .ssh/ directory of your user (or home) directory. The contents will be similar to:

ssh-ed25529 LLoWYaPswHzVqQ7L7B07LzIJbntgmHqrE40t17nGXL71QX9IoFGKYoF5pJKUMvR+DZotTm user@example.comCode-Sprache: CSS (css)

1. Copy the contents of the public key file and paste the key into the Key field of the Add SSH key dialog.
2. Select Add SSH key.
   • If the key is added successfully, the dialog will close and the key will be listed on the Access keys page.
   • If you receive the error That SSH key is invalid, check that you copied the entire contents of the public key (.pub file).

Check that your SSH authentication works

To test that the SSH key was added successfully, open a terminal on your device and run the following command:

<code>ssh -T git@bitbucket.org</code>Code-Sprache: HTML, XML (xml)

If SSH can successfully connect with Bitbucket using your SSH keys, the command will produce output similar to:

<code>authenticated via ssh key. </code>Code-Sprache: HTML, XML (xml)

Remote-URL ändern

git remote set-url origin https://gitlab.com/KodeKloud/repository-1.git

git remote set-url origin https://gitlab.com/KodeKloud/repository-1.git

Stashing (Zwischenspeichern)

git stash // Git Stand zwischenspeichern
git stash pop // Zu letztem Git Stand zurückkehren und diesen gleich löschen
git stash apply [stash-name] // Zu entsprechenden Git-Stand wechseln
git stash drop [stash-name] // Entsprechenden Git-Speicherstand löschen
git stash save "Name des Stashs" // Stash mit Namen speichern
git stash list // Alles stashes auflisten

git stash // Git Stand zwischenspeichern
git stash pop // Zu letztem Git Stand zurückkehren und diesen gleich löschen
git stash apply [stash-name] // Zu entsprechenden Git-Stand wechseln
git stash drop [stash-name] // Entsprechenden Git-Speicherstand löschen
git stash save "Name des Stashs" // Stash mit Namen speichern
git stash list // Alles stashes auflisten

Artikel

Branching

git branch // Alle Branches anzeigen
git checkout -b [BRANCHNAME] // Neuen Branch anlegen und gleich in diesen wechseln
git branch -d [BRANCHNAME] // Löschen des lokalen Branches
git push origin --delete [BRANCHNAME] // Löschen des Remotebranches

git branch // Alle Branches anzeigen
git checkout -b [BRANCHNAME] // Neuen Branch anlegen und gleich in diesen wechseln
git branch -d [BRANCHNAME] // Löschen des lokalen Branches
git push origin --delete [BRANCHNAME] // Löschen des Remotebranches

Artikel | Artikel zum Branchlöschen

Merging

git checkout master // HEAD / Master auschecken
git merge [BRANCHNAME] // Änderungen aus [BRANCHNAME] in master zusammenführen

git checkout master // HEAD / Master auschecken
git merge [BRANCHNAME] // Änderungen aus [BRANCHNAME] in master zusammenführen

Artikel

Diff

git diff --name-only master...xyz // Alle geänderten Dateien in einem Branch auflisten
git diff-tree --no-commit-id --name-only -r bd61ad98 // Alle geänderten Dateien in einem Commit auflisten

git diff --name-only master...xyz // Alle geänderten Dateien in einem Branch auflisten
git diff-tree --no-commit-id --name-only -r bd61ad98 // Alle geänderten Dateien in einem Commit auflisten

Geänderte Dateien auflisten

Verzeichnis aus git NICHT lokal löschen

git rm -r --cached myFolder

git rm -r --cached myFolder

Gelöschte Datei aus altem Stand ansehen

git log -- path/to/file
git show <commit_hash>:path/to/file
# BSP:
git show 3a9fbc1:src/config.php

git log -- path/to/file
git show <commit_hash>:path/to/file
# BSP:
git show 3a9fbc1:src/config.php

Gelöschte Datei aus altem Stand zum Vergleich wiederherstellen

git checkout <commit_hash>^ -- path/to/file
# BSP:
git checkout 3a9fbc1^ -- src/config.php

git checkout <commit_hash>^ -- path/to/file
# BSP:
git checkout 3a9fbc1^ -- src/config.php