Difference between revisions of "Git"

From GLMWiki
Jump to: navigation, search
Line 16: Line 16:
 
==Glm Git Guide==
 
==Glm Git Guide==
 
[[The Great GLM Git Guide]]
 
[[The Great GLM Git Guide]]
 +
 +
==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==
 +
[[How to sign your commit or tags]]
 +
 +
 +
==Git New Website Setup Checklist==
 +
git init
 +
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 home config file ==
 
== Git home config file ==
Line 91: Line 121:
 
==SSH Keys==
 
==SSH Keys==
 
[[Creating your ssh keys (private/public)]]
 
[[Creating your ssh keys (private/public)]]
 
==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==
 
[[How to sign your commit or tags]]
 
  
 
==Reference==
 
==Reference==
 
git book online
 
git book online
 
http://git-scm.com/book
 
http://git-scm.com/book
 
==Git New Website Setup Checklist==
 
git init
 
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]]
 

Revision as of 09:25, 9 June 2016

Git

Git Docs

Try git tutorial

Git Pro Book

Git Tutorial

Git Flow Workflow

git pull --rebase

Installation & Initial Setup

Git Installation & Initial Setup

Glm Git Guide

The Great GLM Git Guide

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

How to sign your commit or tags


Git New Website Setup Checklist

git init
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 home config file

~/.gitconfig

[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

Git Ignore File

create a file called .gitignore_global in you home directory
git config --global core.excludesfile ~/.gitignore_global

# 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/

SSH Keys

Creating your ssh keys (private/public)

Reference

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