DeskTux

Linux on Desktops

User Tools

Site Tools


apps:git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
apps:git [2019-11-09 09:11]
jens [What next?] Remove Jenkins
apps:git [2020-01-02 16:30] (current)
jens [Troubleshooting/Q&A] Typo
Line 46: Line 46:
   * If you ever wonder what branch you are on, you can just run a ''​git status''​ to check that.   * If you ever wonder what branch you are on, you can just run a ''​git status''​ to check that.
   * If you use this for [[:​apps:​puppet|Puppet]] code, you could just create a symlink from the Puppet code directory to your git project:​((Providing you used the same structure as mandatory in the [[:​apps:​puppet#​manifests|Puppet]] code directory. Don't forget to backup first!)) <​code>​ln -sf /​srv/​git/​puppet.git /​etc/​puppet/​code</​code>​   * If you use this for [[:​apps:​puppet|Puppet]] code, you could just create a symlink from the Puppet code directory to your git project:​((Providing you used the same structure as mandatory in the [[:​apps:​puppet#​manifests|Puppet]] code directory. Don't forget to backup first!)) <​code>​ln -sf /​srv/​git/​puppet.git /​etc/​puppet/​code</​code>​
-  * In case you forgot to delete your branch on the server, or want to just delete it remotely, you can do that: <​code>​git push - u origin mybranch --delete</​code>​+  * In case you forgot to delete your branch on the server, or want to just delete it remotely, you can do that: <​code>​git push -u origin mybranch --delete</​code>​
   * If you already started editing but forgot to switch to a new development branch, in many cases it is still possible to just switch to a new branch after you made changes already and just follow the workflow.   * If you already started editing but forgot to switch to a new development branch, in many cases it is still possible to just switch to a new branch after you made changes already and just follow the workflow.
   * In case the local (master) branch is no longer usable, use these steps to reset it: <​code>​   * In case the local (master) branch is no longer usable, use these steps to reset it: <​code>​
apps/git.txt ยท Last modified: 2020-01-02 16:30 by jens