Git: Difference between revisions
From DWIKI
m (→FAQ) |
mNo edit summary |
||
| Line 13: | Line 13: | ||
*[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] | ||
=FAQ= | |||
==error: src refspec master does not match any.== | = FAQ = | ||
== error: src refspec master does not match any. == | |||
ye well, screw you. you did something wrong! | ye well, screw you. you did something wrong! | ||
| |||
== 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.== | == fatal: cannot do a partial commit during a merge. == | ||
git commit -i | git commit -i | ||
==error: Pulling is not possible because you have unmerged files== | == error: Pulling is not possible because you have unmerged files == | ||
community qXcF52,:Kg | |||
== list untracked files == | |||
git status | git status | ||
== Changes not staged for commit: == | |||
File has to be added again | |||
=Cheat sheet= | =Cheat sheet= | ||
Revision as of 18:18, 25 July 2021
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
error: Pulling is not possible because you have unmerged files
community qXcF52,:Kg
list untracked files
git status
Changes not staged for commit:
File has to be added again
Cheat sheet
Create repository on server
mkdir -p git/myproject cd git/project git init --bare
browse local repository
git ls-tree --full-tree -r HEAD
push as different user
check .git/config and replace username
