Difference between revisions of "Git"

From wiki
Jump to navigation Jump to search
Line 2: Line 2:
  
 
==Using Git==
 
==Using Git==
Here is a basic overview of how Git works:
+
Here is a basic overview of how you can work with git@bitbucket works:
  
# Create a "repository" (project) with a git hosting tool (like Bitbucket)
+
* Create a "repository" (project) with a git hosting tool (like Bitbucket)
# Copy (or clone) the repository to your local machine
+
::Add you public key in Settings - 'Access keys'
::<code>git clone <repoURL></code>
+
* Copy (or clone) the repository to your local machine
# Add a file to your local repo and "commit" (save) the changes
+
::<code>git clone <repoURL(replace https with ssh)></code>
 +
* Set push URL to https
 +
::<code>git remote set-url --push origin <SSHrepoURL></code>
 +
* Add a file to your local repo and "commit" (save) the changes
 
::<code>git add <filenname></code>
 
::<code>git add <filenname></code>
# "Push" your changes to your master branch
+
* "Push" your changes to your master branch
 
::<code>git push</code>
 
::<code>git push</code>
# Make a change to your file with a git hosting tool and commit
+
* Make a change to your file with a git hosting tool and commit
# "Pull" the changes to your local machine
+
* "Pull" the changes to your local machine
 
::<code>git pull</code>
 
::<code>git pull</code>
# Create a "branch" (version), make a change, commit the change
+
* Create a "branch" (version), make a change, commit the change
# Open a "pull request" (propose changes to the master branch)
+
* Open a "pull request" (propose changes to the master branch)
# "Merge" your branch to the master branch
+
* "Merge" your branch to the master branch
  
 
;<code>git config --local -l</code>
 
;<code>git config --local -l</code>

Revision as of 17:05, 10 May 2018

Using the Bitbucket code repository with git.

Using Git

Here is a basic overview of how you can work with git@bitbucket works:

  • Create a "repository" (project) with a git hosting tool (like Bitbucket)
Add you public key in Settings - 'Access keys'
  • Copy (or clone) the repository to your local machine
git clone <repoURL(replace https with ssh)>
  • Set push URL to https
git remote set-url --push origin <SSHrepoURL>
  • Add a file to your local repo and "commit" (save) the changes
git add <filenname>
  • "Push" your changes to your master branch
git push
  • Make a change to your file with a git hosting tool and commit
  • "Pull" the changes to your local machine
git pull
  • Create a "branch" (version), make a change, commit the change
  • Open a "pull request" (propose changes to the master branch)
  • "Merge" your branch to the master branch
git config --local -l
List your configuration for this repository (in the current directory).

Local setup

Install the git tools: apt-get install git

Initialize your user with:

a name: git config --global user.name "Your Name"
and email: git config --global user.email "user@domain.tld"

Set line endings correctly: git config --global core.autocrlf input

You homedir now has a .gitconfig files with this information

git config -l
List your configuration on user level