Git: Difference between revisions
From DWIKI
mNo edit summary |
m (→Links) |
||
(3 intermediate revisions by the same user not shown) | |||
Line 2: | Line 2: | ||
*[http://git-scm.com/ Homepage] | *[http://git-scm.com/ Homepage] | ||
*[https://try.github.io Online git tutorial] | *[https://try.github.io Online git tutorial] | ||
*[https://www.atlassian.com/git/tutorials Git tutorial at atlassian] | |||
==Documentation== | ==Documentation== | ||
*[https://git-scm.com/book/en/v1/Getting-Started-First-Time-Git-Setup Getting Started] | *[https://git-scm.com/book/en/v1/Getting-Started-First-Time-Git-Setup Getting Started] | ||
*[https://www.inmotionhosting.com/support/website/git/setting-up-your-remote-repository-with-git/ Setting Up Your Remote Repository With Git] | |||
*[https://git-scm.com/book/uz/v2/Customizing-Git-Git-Attributes Dealing with binary files] | *[https://git-scm.com/book/uz/v2/Customizing-Git-Git-Attributes Dealing with binary files] | ||
*http://gitref.org/basic/ | *http://gitref.org/basic/ | ||
*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- | ||
*[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] | ||
= FAQ = | = FAQ = | ||
Line 33: | Line 33: | ||
== error: Pulling is not possible because you have unmerged files == | == error: Pulling is not possible because you have unmerged files == | ||
== error: Your local changes to the following files would be overwritten by merge:== | |||
move the file away and try again? | |||
== list untracked files == | == list untracked files == | ||
Line 43: | Line 47: | ||
File has to be added again | File has to be added again | ||
| |||
== error: gpg failed to sign the data == | == error: gpg failed to sign the data == | ||
Line 56: | Line 60: | ||
git config --global user.signingkey XXXXX | git config --global user.signingkey XXXXX | ||
==You have divergent branches and need to specify how to reconcile them.== | |||
First try: | |||
git merge | |||
=Cheat sheet= | =Cheat sheet= |
Revision as of 13:24, 22 December 2022
Links
Documentation
- Getting Started
- Setting Up Your Remote Repository With Git
- 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
error: Your local changes to the following files would be overwritten by merge:
move the file away and try again?
list untracked files
git status
Changes not staged for commit:
File has to be added again
error: gpg failed to sign the data
try
GIT_TRACE=1 commit ...
and run the command it suggests
but your problably forgot to
git config --global user.signingkey XXXXX
You have divergent branches and need to specify how to reconcile them.
First try:
git merge
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