Difference between revisions of "Git"

From DWIKI
⧼monobook-jumptonavigation⧽⧼monobook-jumptosearch⧽
 
Line 24: Line 24:
 
  git commit -i
 
  git commit -i
  
 +
==error: Pulling is not possible because you have unmerged files==
 +
 +
 +
community qXcF52,:Kg
  
 
==list untracked files==
 
==list untracked files==

Latest revision as of 11:56, 30 July 2020

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

community qXcF52,:Kg

list untracked files

git status

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