Git: Difference between revisions

From DWIKI
mNo edit summary
 
(14 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 in the Pro Git Book]
*[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-
*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]


=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
==Switch to particular branch==
git branch -a
git checkout remote/releases/6.4
and to get back
git checkout master
or was it
git checkout


= FAQ =
= FAQ =
==git pull==
===You are not currently on a branch.===
==Restore single file==
Move the file away and
git restore yourfile
==git checkout==
===error: pathspec 'master' did not match any file(s) known to git===
then you get that from
git checkout master
try
git checkout -
==Automatic merge failed; fix conflicts and then commit the result.==
Try
  git mergetool


== error: src refspec master does not match any. ==
== error: src refspec master does not match any. ==
Line 33: Line 78:
== 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 92:
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 ==


try
try
  GIT_TRACE=1 commit ...
  GIT_TRACE=1 commit ...
and run the command it suggests
and run the command it suggests


=Cheat sheet=
but your problably forgot to
 
==Create repository on server==
mkdir -p git/myproject
cd git/project
git init --bare
 


==browse local repository==
 git config --global user.signingkey  XXXXX
git ls-tree --full-tree -r HEAD


==push as different user==
==You have divergent branches and need to specify how to reconcile them.==
  check .git/config and replace username
First try:
  git merge

Latest revision as of 11:53, 7 March 2024

Links

Documentation

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


Switch to particular branch

git branch -a
git checkout remote/releases/6.4

and to get back

git checkout master

or was it

git checkout

FAQ

git pull

You are not currently on a branch.

Restore single file

Move the file away and

git restore yourfile


git checkout

error: pathspec 'master' did not match any file(s) known to git

then you get that from

git checkout master

try

git checkout -


Automatic merge failed; fix conflicts and then commit the result.

Try

 git mergetool

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