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:gitconcepts [2019/01/12 20:10] alfred [Notes] |
wiki2:gitconcepts [2021/10/01 16:19] (actual) |
||
|---|---|---|---|
| Línea 193: | Línea 193: | ||
| <code> | <code> | ||
| + | # Add the new remote to the project | ||
| git remote add -f <remote name> <remote address> | git remote add -f <remote name> <remote address> | ||
| + | # Attach the new code | ||
| git subtree add --prefix <folder> <remote name> <branch> --squash | git subtree add --prefix <folder> <remote name> <branch> --squash | ||
| </code> | </code> | ||
| Línea 229: | Línea 231: | ||
| ===== Notes ===== | ===== Notes ===== | ||
| - | GitLab's "merge request" feature is equivalent to GitHub's "pull request" feature. Both are means of pulling changes from another branch or fork into your branch and merging the changes with your existing code. They are useful tools for code review and change management. | + | GitLab's **"merge request"** feature is equivalent to GitHub's** "pull request"** feature. Both are means of pulling changes from another branch or fork into your branch and merging the changes with your existing code. They are useful tools for code review and change management. |
| Línea 249: | Línea 251: | ||
| * https://www.atlassian.com/git/tutorials/gitignore/ | * https://www.atlassian.com/git/tutorials/gitignore/ | ||
| + | ==== Problems with certificates ==== | ||
| + | |||
| + | You can solve them by [1] [[wiki2:linux_howto#update_system_certificate_authority|updating the certificate authority]] or [2] ''export GIT_SSL_NO_VERIFY=1'' or [3] ''git config --global http.sslverify false''. | ||