Git: Difference between revisions
From DWIKI
m (→FAQ) |
m (→FAQ) |
||
| Line 9: | Line 9: | ||
*http://git-scm.com/book/en | *http://git-scm.com/book/en | ||
*https://www.atlassian.com/git/tutorials | *https://www.atlassian.com/git/tutorials | ||
*[http://thelucid.com/2008/12/02/git-setting-up-a-remote-repository-and-doing-an-initial- | *[http://thelucid.com/2008/12/02/git-setting-up-a-remote-repository-and-doing-an-initial- | ||
*[https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository Recording Changes to the Repository] | *[https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository Recording Changes to the Repository] | ||
*[https://raymii.org/s/tutorials/Shared_Git_repository_via_ssh_for_multiple_users.html Shared Git repository over ssh for multiple users] | *[https://raymii.org/s/tutorials/Shared_Git_repository_via_ssh_for_multiple_users.html Shared Git repository over ssh for multiple users] | ||
| Line 20: | Line 20: | ||
==error: Merging is not possible because you have unmerged files.== | ==error: Merging is not possible because you have unmerged files.== | ||
This is not a joke! | This is not a joke! | ||
==fatal: cannot do a partial commit during a merge.== | |||
git commit -i | |||
=Cheat sheet= | =Cheat sheet= | ||
Revision as of 12:17, 3 December 2019
Links
Documentation
- Getting Started
- Dealing with binary files
- http://gitref.org/basic/
- http://git-scm.com/book/en
- https://www.atlassian.com/git/tutorials
- [http://thelucid.com/2008/12/02/git-setting-up-a-remote-repository-and-doing-an-initial-
- Recording Changes to the Repository
- Shared Git repository over ssh for multiple users
FAQ
error: src refspec master does not match any.
ye well, screw you. you did something wrong!
error: Merging is not possible because you have unmerged files.
This is not a joke!
fatal: cannot do a partial commit during a merge.
git commit -i
Cheat sheet
Create repository on server
mkdir -p git/myproject cd git/project git init --bare
Zabbix apps
Zabbix Alert
Does exactly that: show alerts.
The official app
Totally broken
browse local repository
git ls-tree --full-tree -r HEAD
push as different user
check .git/config and replace username
