github basic usage in windows

1. create a new accout, create orginazation, create repo

2. install git in your local pc

Note: you can create ssh key to avoid username/password input for github operation
https://help.github.com/articles/generating-ssh-keys https://help.github.com/articles/set-up-git
3. git clone https://github.com/elulian/CustomerSecurityManagementSystem.git
Note: failed to connect to github 443 windows/ Failed to connect to gitHub - No Error

check your git proxy setting:

git config --global http.proxy

Reset git proxy setting:

git config --global --unset http.proxy

set git proxy:

git config --global http.proxy ***@****:8080

git config --global https.proxy ****@****:8080

#git config --global http.sslverify false

4.git branch -a to list all the branches, normally we are working in the origin/master branch, so direclty add/change files

5. If you are using eclipse, you can simple use eclipse git gui, my suggestion, if you want to use git bash, you can use below commands:

5.1 git add command to track your changes in local repo

warning: LF will be replaced by CRLF in src/main/webapp/WEB-INF/web.xml.

In Unix systems the end of a line is represented with a line feed (LF). In windows a line is represented with a carriage return (CR) and a line feed (LF) thus (CRLF). when you get code from git that was uploaded from a unix system they will only have a LF.

5.2. git status/gitk to check your changes, git commit to local repo

Note: create mode 100644

The following flags are defined for the st_mode field:

S_IFMT 0170000 bit mask for the file type bit fields

S_IFSOCK 0140000 socket

S_IFLNK 0120000 symbolic link

S_IFREG 0100000 regular file

S_IFBLK 0060000 block device

S_IFDIR 0040000 directory

S_IFCHR 0020000 character device

S_IFIFO 0010000 FIFO

S_ISUID 0004000 set UID bit

S_ISGID 0002000 set-group-ID bit (see below)

S_ISVTX 0001000 sticky bit (see below)

S_IRWXU 00700 mask for file owner permissions

S_IRUSR 00400 owner has read permission

S_IWUSR 00200 owner has write permission

S_IXUSR 00100 owner has execute permission

S_IRWXG 00070 mask for group permissions

S_IRGRP 00040 group has read permission

S_IWGRP 00020 group has write permission

S_IXGRP 00010 group has execute permission

S_IRWXO 00007 mask for permissions for others (not in group)

S_IROTH 00004 others have read permission

S_IWOTH 00002 others have write permission

S_IXOTH 00001 others have execute permission

5.3. git pull origin master to merge changes if require (git stash/stash pop, git reset --hard)

Note: for code merge, I am using kdiff3:

a. install kdf

b. git config --global merge.tool kdiff3

c. git config --global mergetool.kdiff3.cmd '"(kdiff3 installation path (C:\\Program Files (x86)\\KDiff3\\kdiff3)" $BASE $LOCAL $REMOTE -o $MERGED'

d. git mergetool

5.4. git push origin master to remote repo

Note: username/password: your github username/password

git config --global user.name [your github username]

git config --global user.password [your github password]