git config --global user.name "Jack Liu"
git config --global user.email "[email protected]"
git config --global core.editor "notepadd++.exe -multiInst -nosession"  # git config --global -e 
git config --list
cat ~/.gitconfig

git add .
git commit -m "blah"
git commit -am "blah"   # add and commit 
git status
git diff
git diff --color-word

github.com/git/git
contrib/completion/git-completion.bash

## Git Log
git help log
man git-log
git log -n 5  # same as git log -5 
git log --since=2019-01-01
git log --until=2020-01-01
git log --until="3 days ago"
git log --after=2.weeks --before=3.days
git log --author="Kevin"
git log --grep="Init"
git log cmit#1..cmit#2
git log cmit#1..HEAD
git log file1  #show all the cmit on this file
git log -p #show cmit info, also with the exact changes  -p stadnds for patch or change
git log -L 100,150:myfile.txt
git log --stat   #show how many changes, not what changes
git log --foramt=oneline  # online, short, medium, full, fuller, etcgit
git log --online # reduce long sha to short sha
git log --graph
git log --graph --all --oneline --decorate

# HEAD
refs/head/master
git diff  #compare working dir to starging by default
git diff --stage #compare staging and repo
git diff --cache #same as above

git rm file1
git commit -m "delete file1"

## rename
mv first.txt primary.txt
git status # show 2 changes: 1 is delete first.txt, 2: add primary.txt
git rm first.txt
git add primary.txt
git status # git regonize and show rename first.txt to primary.txt

git mv secondary.txt secondary.txt # change the file in working txt, and take it to staging

git commit -am "msg" # doesn't add new file
git show cmit# --color-words
git diff cmit#1..cmit#2  --color-words #compare 2 commit
git diff cmit#..HEAD

git commit -a  # multi-line message: 1st line - summary, 2nd line - blank, 3rd - more lines

## discard change
git checkout -- file1  # grab file1 from repo to cur dir
git checkout -- . # grab all from repo to cur dir

## Unstaging file
git add file1 
git reset HEAD file  # mv it from staging 

## amend commit
git add file1
git commit -m 'file1 change1"
# make change to file1 
git commit -m "file1 change2"
git commit -amend -m "file change2"
git status # show "file change2" msg with chang1 and change2
#make no change, just change the cmt msg
git commit -amend -m "file1 another change"
git stauts # show "file1 another change" msg with change1 and change2


## Retrive Old version
git checkout cmit# -- file1.txt  
git status  #show file1.txt in staging and cur dir

# make change to file1
git add file1
git reset HEAD file1  # remove from staging to working dir
git checkout -- file1  # overwrite it from repo

# revert change
git revert cmit#

# remove untracked files
git clean  # -i -n -f
git clean -n # dry run
git clean -f

### .gitignore
https://github.com/github/github
project/.gitignore

git config --global core.execludesfile ~/.gitignore_global

git rm --cache file1 # rm from staging, not working dir
git ls-tree HEAD

de1461f^  #parent of cmt de1461f
HEAD^  # parent of HEAD
master^
HEAD~1, HEAD~   #parent of HEAD
git show HEAD^

^^  #parent of parent
de1461f^^
HEAD^^
HEAD~2 # parent of parent of HEAD
git show HEAD^^

git show HEAD~2
git show HEAD~3


## ls-tree
git ls-tree HEAD
git ls-tree HEAD folder1   #list just the folder
git ls-tree HEAD folder1/  #list all files under folder1

git branch  #show branches
git branch new_feature
cat .git/HEAD #show head 
root@kubernetes01:~/gitpractice/.git/refs/heads# ls -tlr
total 8
-rw-r--r-- 1 root root 41 Jul 21 16:21 master
-rw-r--r-- 1 root root 41 Jul 21 17:12 new_feature

git checkout new_feature
git branch
root@kubernetes01:~/gitpractice# git branch
  master
* new_feature
root@kubernetes01:~/gitpractice# cat .git/HEAD
ref: refs/heads/new_feature

git checkout -b branch1 # create new branch1 and checkout

## cannt switch to a branch: commit to the current branch, remove it, stash

# compare branches
git diff --color-words new_feature..short
git branch --merged
git branch --no-merged

root@kubernetes01:~/gitpractice# git branch
  master
  new_feature
* short
root@kubernetes01:~/gitpractice# git branch --merged
  master
  new_feature
* short

root@kubernetes01:~/gitpractice# git checkout new_feature
Switched to branch 'new_feature'
root@kubernetes01:~/gitpractice# git branch --merged
  master
* new_feature
root@kubernetes01:~/gitpractice# git branch --no-merged
  short


# Rename Branch
root@kubernetes01:~/gitpractice# git branch
  master
* new_feature
  short
root@kubernetes01:~/gitpractice# git branch -m seo_feature
root@kubernetes01:~/gitpractice# git branch
  master
* seo_feature
  short
# git branch -m br1 br2   # even without checkout br1  

# Delete Branch
root@kubernetes01:~/gitpractice# git checkout master
Switched to branch 'master'
root@kubernetes01:~/gitpractice# git branch branch2delete
root@kubernetes01:~/gitpractice# git branch
  branch2delete
* master
  seo_feature
  short
root@kubernetes01:~/gitpractice# git branch -d branch2delete
Deleted branch branch2delete (was a6aabc6).
root@kubernetes01:~/gitpractice# git branch
* master
  seo_feature
  short

git branch -D branch2delete   # if any un merged commit in it

# git prompt
https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh

git reset --soft <tree-is>

[root@kubernetes01 gitpractice (master)]# git branch
* master
  seo_feature
  short
[root@kubernetes01 gitpractice (master)]# git checkout -b reset_branch short
Switched to a new branch 'reset_branch'
[root@kubernetes01 gitpractice (reset_branch)]# git branch
  master
* reset_branch
  seo_feature
  short
[root@kubernetes01 gitpractice (reset_branch)]# git log -1
commit 127ea2841dd0e8ccffc7925b12cf6c1056cb3003 (HEAD -> reset_branch, short)
Author: Jack.Liu <[email protected]>
Date:   Wed Jul 21 17:30:55 2021 -0400

    another
[root@kubernetes01 gitpractice (reset_branch)]#

git reset --mixed tree-ish  #defult as git reset tree-ish

git reset --hard tree-ish  

git checkout master
git merge seo_feature
root@kubernetes01:~/gitpractice# git log --oneline
58d4df5 (HEAD -> master, seo_feature) Modifies a.txt in new-feature
a6aabc6 add eee
0a39700 adding more
ad82f87 adding a.txt
root@kubernetes01:~/gitpractice# git diff master..seo_feature
root@kubernetes01:~/gitpractice# git branch --merged
* master
  seo_feature
root@kubernetes01:~/gitpractice#

git diff --color-words  master..text_edits a.txt
git show --color-words 

root@kubernetes01:~/gitpractice# git status
On branch short
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   a.txt

no changes added to commit (use "git add" and/or "git commit -a")
root@kubernetes01:~/gitpractice# git checkout master
error: Your local changes to the following files would be overwritten by checkout:
        a.txt
Please commit your changes or stash them before you switch branches.
Aborting
root@kubernetes01:~/gitpractice# git stash save "stash1"
Saved working directory and index state On short: stash1
root@kubernetes01:~/gitpractice# git status
On branch short
nothing to commit, working tree clean
root@kubernetes01:~/gitpractice# cat a.txt
iii
ddd
eee
new-feature
short
another change
root@kubernetes01:~/gitpractice# git checkout master
Switched to branch 'master'
root@kubernetes01:~/gitpractice# git checkout short
Switched to branch 'short'
root@kubernetes01:~/gitpractice# git stash list
stash@{0}: On short: stash1
root@kubernetes01:~/gitpractice# git stash show stash@{0}
 a.txt | 1 +
 1 file changed, 1 insertion(+)
root@kubernetes01:~/gitpractice# git stash show -p stash@{0}
diff --git a/a.txt b/a.txt
index c0f1036..ef4a577 100644
--- a/a.txt
+++ b/a.txt
@@ -3,4 +3,5 @@ ddd
 eee
 new-feature
 short
+short1
 another change
root@kubernetes01:~/gitpractice#
root@kubernetes01:~/gitpractice# git stash pop    ## pop remove stash
On branch short
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   a.txt

no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (6ba9ec2c2844157626ca72286fbe57156cc65eaa)
root@kubernetes01:~/gitpractice#
root@kubernetes01:~/gitpractice# git stash save "another"
Saved working directory and index state On short: another

root@kubernetes01:~/gitpractice# git stash list
stash@{0}: On short: another
root@kubernetes01:~/gitpractice# git stash apply   ## doens't remove stash
On branch short
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   a.txt

no changes added to commit (use "git add" and/or "git commit -a")
root@kubernetes01:~/gitpractice# git stash list
stash@{0}: On short: another
root@kubernetes01:~/gitpractice#

root@kubernetes01:~/gitpractice# git stash list
stash@{0}: On short: another
root@kubernetes01:~/gitpractice# git stash save "Delete me"
Saved working directory and index state On short: Delete me
root@kubernetes01:~/gitpractice# git stash list
stash@{0}: On short: Delete me
stash@{1}: On short: another
root@kubernetes01:~/gitpractice# git stash drop stash@{0}
Dropped stash@{0} (bdfc2ede72cf9c8867155121fd73e75b434afefb)
root@kubernetes01:~/gitpractice# git stash list
stash@{0}: On short: another
root@kubernetes01:~/gitpractice# git stash clear  # delete all the stash
root@kubernetes01:~/gitpractice# git stash list  
root@kubernetes01:~/gitpractice#

#remote branch cannot be check out
git remote add origin https://github.com/....
git remote 
git remote -v
git remote rm origin
git branch -r   # remote branch
git branch -a   # all branch: local and remote

git clone  https://github.com/jhong40/mytest.git anotherfolder
git fetch origin # bring the remote to the local origin

git checkout master
git fetch
git merge origin/master  #resolve any conflict


git pull # = git fetch + git merge

# create loal branch from remote
git branch brancha origin/brancha  #create branch based on origin/brancha
git checkout brancha origin/brancha

# create remote brach
git push -u brancha origin

# delete remote branch
git push orgin :brancha  # delete brancha
git push origin --delete brancha

## Developer1
git checkout master
git fetch
git merge origin/master
git checkout -b feature1
git add myfile
git commit -m "adding feature1"
git fetch
git push -u feature1 origin

## Developer2
git checkout master
git fetch
git merge origin/master
git checkout -b feature1 origin/feature1
git log
git show sha#
git commit -am "improve feature1"
git fetch
git push   # it is a tracked branch, no need for origial feature1


## Developer1
git fetch
git log -p feature1..origin/feature1
git merge origin/feature1    #ok for the improve feature1
git checkout master
git fetch
git merge origin/master   #if origin/master has change
git merge feature1
git push   # master is tracked, so no origin master

git blame file1.txt  # shows who made the change on that each line, and when
git blame -w File1.txt  #ignor white space
git blame -L 100,105 file1.txt
git blame -L 100,+5 file1.txt   #100,105
git blame d9dba0 file1.txt
git blame d9dba0 -- file1.txt

git annotate file1.txt   # similar to blame, diff output format
git config --global alias.praise blame   # praise = blame, git praise file1.txt = git blame file1.txt

git bisect start
git bisect bad  # git bisect bad HEAD
git bisect good <treeish>  # last known good version

#git will found the mid point version, user need to test and confirm it is good or bad
#git bisect good
#git bisect bad
#eventually it will find the version which introduce the bug

git bisect reset