Muestra las diferencias entre dos versiones de la página.
| Ambos lados, revisión anterior Revisión previa Próxima revisión | Revisión previa | ||
|
wiki2:git_pipelines [2022/03/11 08:41] alfred [Commits] |
wiki2:git_pipelines [2022/03/13 11:35] (actual) |
||
|---|---|---|---|
| Línea 14: | Línea 14: | ||
| ===== How to... ===== | ===== How to... ===== | ||
| - | ==== Commits ==== | ||
| - | === Configure an ssh key === | + | ==== Configure an ssh key ==== |
| Generate an ssh key without passphrase or it will keep asking you for for it. You need to upload the public key to the server. Then, configure the host in your ssh config: | Generate an ssh key without passphrase or it will keep asking you for for it. You need to upload the public key to the server. Then, configure the host in your ssh config: | ||
| Línea 30: | Línea 29: | ||
| </code> | </code> | ||
| - | === ... get a commit from another branch? === | + | ℹ️ If you want to debug, you can do: |
| + | <code> | ||
| + | ssh -vvv git@git.alfredgg.dev | ||
| + | </code> | ||
| + | ==== This could be a good config ==== | ||
| + | <code> | ||
| + | Host git.alfredgg.dev | ||
| + | Port 222 | ||
| + | IdentityFile ~/.ssh/keys/gitkey | ||
| + | User git | ||
| + | </code> | ||
| + | |||
| + | ==== Commits ==== | ||
| + | |||
| + | ==== ... get a commit from another branch? ==== | ||
| <code> | <code> | ||
| git cherry-pick <commit> | git cherry-pick <commit> | ||
| </code> | </code> | ||
| + | |||
| ==== Merges ==== | ==== Merges ==== | ||