Difference between revisions of "Git"

From DWIKI
⧼monobook-jumptonavigation⧽⧼monobook-jumptosearch⧽
m
m
 
Line 12: Line 12:
 
*[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 33: Line 34:
 
== error: Pulling is not possible because you have unmerged files ==
 
== error: Pulling is not possible because you have unmerged files ==
  
community qXcF52,:Kg
+
== 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 48:
 
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 ==

Latest revision as of 14:50, 11 October 2021

Links

Documentation



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

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