Difference between revisions of "Git"

From GLMWiki
Jump to: navigation, search
 
(12 intermediate revisions by the same user not shown)
Line 1: Line 1:
 
[[Image:Git-Icon.png|center|Git]]
 
[[Image:Git-Icon.png|center|Git]]
 +
==GLM Git Guide==
 +
[[The Great GLM Git Guide]]
 +
 
==Git Docs==
 
==Git Docs==
 
[http://try.github.com/ Try git tutorial]
 
[http://try.github.com/ Try git tutorial]
Line 13: Line 16:
 
==Installation & Initial Setup==
 
==Installation & Initial Setup==
 
[[Git Installation & Initial Setup]]
 
[[Git Installation & Initial Setup]]
 
==Glm Git Guide==
 
[[The Great GLM Git Guide]]
 
  
 
==Setup ssh-agent==
 
==Setup ssh-agent==
Line 29: Line 29:
  
 
==gpg signing==
 
==gpg signing==
[[How to sign your commit or tags]]
+
If you’re making signed annotated tags (as discussed in Chapter 2 of Git Pro), setting your GPG signing key as a configuration setting makes things easier. Set your key ID like so:
  
 +
git config --global user.signingkey <gpg-key-id>
  
 
==Git New Website Setup Checklist==
 
==Git New Website Setup Checklist==
git init
+
[[The Great GLM Git Guide#Git New Website Setup Checklist|Git New Website Setup Checklist]]
git flow init: all defaults except the version tag prefix, which is v
+
git status
+
git add .
+
git commit -m "Initial Commit"
+
OR git commit, so you can check files, then "Initial Commit"
+
git push --all
+
git push --tags
+
git branch --set-upstream develop origin/develop
+
git branch --set-upstream master origin/master
+
  
 
== Git Flow ==
 
== Git Flow ==
[[Git Flow]]
+
[[The Great GLM Git Guide#Git Flow|Git Flow]]
  
 
== Git home config file ==
 
== Git home config file ==
~/.gitconfig
+
[[The_Great_GLM_Git_Guide#Git_home_config_file| Git home config file]]
<pre>
+
[user]
+
    name = (your name)
+
    email = (your email)
+
[color]
+
    diff = always
+
    ui = true
+
[core]
+
    excludesfile = /home/(your user)/.gitignore_global
+
    autocrlf = input
+
    sharedRepository = 0664
+
[alias]
+
    ci = commit
+
    co = checkout
+
    br = branch
+
    st = status
+
    graph = log --pretty=format:\"%h %s\" --graph
+
[push]
+
    default = simple
+
[branch]
+
    autosetuprebase = always
+
</pre>
+
  
 
== Git Ignore File ==
 
== Git Ignore File ==
create a file called .gitignore_global in you home directory <br>
+
[[The_Great_GLM_Git_Guide#Git_ignore_file|Git Ignore File Setup]]
git config --global core.excludesfile ~/.gitignore_global
+
<pre>
+
# OS generated files #
+
######################
+
.DS_Store*
+
ehthumbs.db
+
Icon?
+
Thumbs.db
+
._*
+
*.swp
+
 
+
# Gaslight Media Application specific #
+
# files that are updated on server    #
+
#######################################
+
admin/logs/
+
GLM_site_check.phtml
+
iconCache/
+
uploads/
+
cache/
+
compiled/
+
compile/
+
original/
+
resized/
+
midsized/
+
thumb/
+
thumbs/
+
ht_images/
+
photo-large/
+
photo-small/
+
prototype/
+
weather-feed.xml
+
php.error
+
reports/
+
editimagesworkwith/
+
editimagesoriginal/
+
editedImages/
+
editimagespng/
+
.buildpath
+
.settings
+
.project
+
.svn
+
nbproject/
+
smarty/
+
</pre>
+
  
 
==SSH Keys==
 
==SSH Keys==

Latest revision as of 10:26, 9 June 2016

Git

GLM Git Guide

The Great GLM Git Guide

Git Docs

Try git tutorial

Git Pro Book

Git Tutorial

Git Flow Workflow

git pull --rebase

Installation & Initial Setup

Git Installation & Initial Setup

Setup ssh-agent

ssh-agent on windows(git bash)

Git-Svn

Checking out a site from svn with git (limit git) git svn http://git-scm.com/book/ch8-1.html

Gitolite

Creating a new Git repo

gpg signing

If you’re making signed annotated tags (as discussed in Chapter 2 of Git Pro), setting your GPG signing key as a configuration setting makes things easier. Set your key ID like so:

git config --global user.signingkey <gpg-key-id>

Git New Website Setup Checklist

Git New Website Setup Checklist

Git Flow

Git Flow

Git home config file

Git home config file

Git Ignore File

Git Ignore File Setup

SSH Keys

Creating your ssh keys (private/public)

Reference

git book online http://git-scm.com/book