Git

❯ ll .git
total 32
-rw-r--r--   1 coyote  staff    23B May 14 18:56 HEAD
-rw-r--r--   1 coyote  staff   137B May 14 18:56 config
-rw-r--r--   1 coyote  staff    73B May 14 18:56 description
drwxr-xr-x  14 coyote  staff   448B May 14 18:56 hooks		# directory 一些钩子脚本
-rw-r--r--   1 coyote  staff   176B May 14 19:01 index    # 暂存区当前的信息
drwxr-xr-x   3 coyote  staff    96B May 14 18:56 info			# directory
drwxr-xr-x   6 coyote  staff   192B May 14 19:01 objects	# directory 所有数据内容
drwxr-xr-x   4 coyote  staff   128B May 14 18:56 refs			# directory 存储数据 commit 对象的指针（收藏夹）heads, tags

❯ tree .git/objects
.git/objects
├── 3d
│   └── 4db092fd0fd1d1123323e66b47ac05e775cae3
├── e9
│   └── 301bd6b82ab3728f6fc78c396879a458e648d6
├── info
└── pack

❯ git cat-file -t 3d4d
blob
❯ git cat-file -p 3d4d
123123

❯ tree .git/objects
.git/objects
├── 3d
│   └── 4db092fd0fd1d1123323e66b47ac05e775cae3
├── 93	# 新增的
│   └── baaa51e254faac23bf2ae2a6fe42c96369da0e
├── e9
│   └── 301bd6b82ab3728f6fc78c396879a458e648d6
├── f9	# 新增的
│   └── 694a5dfdc51dbe2ebcee9306c14f4dec4e4dd0
├── info
└── pack

❯ git cat-file -t 93ba
tree
❯ git cat-file -p 93ba
100644 blob 3d4db092fd0fd1d1123323e66b47ac05e775cae3	a.txt
100644 blob e9301bd6b82ab3728f6fc78c396879a458e648d6	b.txt
❯ git cat-file -t f969
commit
❯ git cat-file -p f969
tree 93baaa51e254faac23bf2ae2a6fe42c96369da0e
author yourname <yourname@example.com> 1589865135 +0800
committer yourname <yourname@example.com> 1589865135 +0800
 
[+] init

❯ tree .git/objects
.git/objects
├── 12	# 新增的tree
│   └── 6ce6bd8e29f234a04f91e733aa9b4c4e690afe
├── 16	#	修改过的a.txt
│   └── 8454e1f8f10a51b7f7ff4cca1bbcb7c573c38d
├── 24	# 新增的commit
│   └── e3bb0ca06df989ea740219180c131c2c2b7aba
├── 3d
│   └── 4db092fd0fd1d1123323e66b47ac05e775cae3
├── 93
│   └── baaa51e254faac23bf2ae2a6fe42c96369da0e
├── e9
│   └── 301bd6b82ab3728f6fc78c396879a458e648d6
├── f9
│   └── 694a5dfdc51dbe2ebcee9306c14f4dec4e4dd0
├── info
└── pack
❯ git cat-file -t 24e3
commit
❯ git cat-file -t 126c
tree
❯ git cat-file -t 1684
blob
❯ git cat-file -p 1684
rrr
❯ git cat-file -p 24e3
tree 126ce6bd8e29f234a04f91e733aa9b4c4e690afe
parent f9694a5dfdc51dbe2ebcee9306c14f4dec4e4dd0					# 注意多了一个父节点commit的哈希
author lijingwei07 <lijingwei07@meituan.com> 1589865678 +0800
committer lijingwei07 <lijingwei07@meituan.com> 1589865678 +0800
 
2nd

❯ cat .git/HEAD
ref: refs/heads/master
❯ cat .git/refs/heads/master
24e3bb0ca06df989ea740219180c131c2c2b7aba

❯ tree .git/refs
.git/refs
├── heads
│   └── master
└── tags
    └── test
 
❯ cat .git/refs/tags/test
e313b468a3809ca6aabbc1dc716000c078cb2e19	# 也是一个hash，保存的是备注信息
❯ git cat-file -t e313
tag
❯ git cat-file -p e313
object 24e3bb0ca06df989ea740219180c131c2c2b7aba			# 记录版本的commit号
type commit
tag test
tagger yourname <yourname@example.com> 1589866604 +0800
 
test			# add tag时候让写的备注吧

git branch -m <oldname> <newname>
# -m == --move

git branch -vv

git branch --delete <branchname>

git commit --amend -m 'add b'

pick 7b9162b local arr
pick 6174d7a local yes ok
pick 0c6eb12 mm
 
# Rebase 3351b9f..0c6eb12 onto 3351b9f (3 commands)
#
# Commands:
# p, pick <commit> = use commit
# ...

pick 7b9162b local arr
drop 6174d7a local yes ok
reword 0c6eb12 reword comment msg!
 
# Rebase 3351b9f..0c6eb12 onto 3351b9f (3 commands)
#
# Commands:
# p, pick <commit> = use commit
# ...

git clone --depth 1 --branch main --single-branch

git stash save

git stash save -u [msg]
# git stash save --include-untracked

git stash list

stash@{0}: On master: ssss
stash@{1}: WIP on master: c73bd7c deletel
stash@{2}: WIP on master: c73bd7c deletel
(END)

git stash apply stash@{2}

git stash pop

git stash show -p

git stash branch <name> stash@{1}

git status -sb  # --short --branch alias gsb

[alias]
  lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
  lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
  lg = !"git lg2"

[pretty]
    slog = format:%C(yellow)%h %Cred%as %Cblue%an%Cgreen%d %Creset%s
    bw = format:%h | %as | %>(20,trunc)%d%x09%s

git log --pretty=slog

git diff -w --word-diff=color --ignore-space-at-eol

git submodule add <url/of/project> [file/path]

[submodule "DbConnector"]
	path = DbConnector
	url = https://github.com/chaconinc/DbConnector

git clone --recurse-submodules <xxx.git>

git submodule init
git submodule update

git config --global alias.st status

$ cat ~/.gitconfig
[user]
   name = Jan Krag
   email = jan.krag@eficode.com
[alias]
   st = status

[alias]
    s  = status
    st = status
    c = commit
    sw = switch
    br = branch

[alias]
    comit = commit
    swicht = switch
    statut = status

alias frequentgit='history | cut -c 8- | grep git | sort | uniq -c  | sort -n -r | head -n 10'
 

git --paginate status

pst = --paginate status # so that output doesn't stick around on your screen and scroll buffer when you quit less
listconfig = --no-pager config --list # so that output stays on your screen and scroll buffer to allow copy/paste

# 匿名的 commit
annoncommit = -c user.name="Anonymous" -c user.email="notme@localhost" commit

# Verbose commit (add diff to comments in commit text)
vcommit = -c commit.verbose=true commit
# Use VSCode for editing, just this once
vscommit = -c core.editor="code --wait" commit  # or `code-insiders`
# Use VSCode for interactive rebase
riv = -c sequence.editor="code --wait" rebase -i # or `code-insider`

[alias]
    rootpath = !pwd
    rootstatus = !git status
    sr = !git status
    # git git git git status 也可以 work 哈哈
    git = !git

[alias]
  # init new git repo with empty initial commit
  start =
   !git init && git commit --allow-empty -m \"Initial commit\"
 

[alias]
  remoteurl  = "remote get-url origin"
  remotehttps = "!git remoteurl | sed  -e 's/git@/https:\\/\\//'"
  remotecopy   = "!git remotehttps | pbcopy"

[alias]
  loc = "!git log --author=$(git config --get user.name) --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf \"added lines: %s, removed lines: %s, total lines: %s\\n\", add, subs, loc }'"

[alias]
  rmbranch =
  "!f(){ git branch -d ${1} && git push origin --delete ${1}; }; f"

[alias]
  # Delete all branches merged into master.
  # With -f also include branches merged into current
  sweep = ! \
        git branch --merged $( \
        [ $1 != \"-f\" ] \\\n \
            && git rev-parse master \
        ) \
        | egrep -v \"(^\\*|^\\s*(master|develop)$)\" \\\n \
        | xargs git branch -d

[alias]
  # Open repo in browser
  browse = "!f() { \
          open `git remote -v \
          | awk '/fetch/{print $2}' \
          | sed -Ee 's#(git@|git://)#http://#' -e 's@com:@com/@'` \
          | head -n1; \
     }; f"

[alias]
  udiff =
    "!f() { \
            for next in \
                $(git ls-files --others --exclude-standard); \
            do \
              git --no-pager diff --no-index /dev/null $next; \
            done;
      }; f"

[alias]
  churn = !git -p log --all -M -C --name-only \
      --format='format:' $@ \
        | sort \
        | grep -v '^$' \
        | uniq -c \
        | sort -r \
        | awk 'BEGIN {print count,file} {print $1 , $2}'

[alias]
  # merge --continue, rebase --continue
  # whatever --continue
  continue = "!f() { \
        repo_path=$(git rev-parse --git-dir) && \
        [ -d \"${repo_path}/rebase-merge\" ] && git rebase --continue && return; \
        [ -d \"${repo_path}/rebase-apply\" ] && git rebase --continue && return; \
        [ -f \"${repo_path}/MERGE_HEAD\" ] && git merge --continue && return; \
        [ -f \"${repo_path}/CHERRY_PICK_HEAD\" ] && git cherry-pick --continue && return; \
        [ -f \"${repo_path}/REVERT_HEAD\" ] && git revert --continue && return; \
        echo \"Nothing to continue?\"; \
    }; f"

[alias]
  exportalias = "!f() { in=${1}; out=$(git config --get alias.$in) ;      printf 'git config --global alias.%s %q\n' $in \"$out\";};f"

$ git exportalias start
git config --global alias.start \!git\ init\ \&\&\ git\ commit\ --allow-empty\ -m\ \"Initial\ commit\"

git rm -r --cached .
git add .
git commit -m 'msg'

git rm $(git ls-files -d)

git checkout -

git stripspace < README.md

git fetch origin refs/pull/[PR-Number]/head

git show :/query # 比如 git show :/ci 可以查到相关 commit message 中包含 ci 的 commit

git branch --merged

git branch --no-merged

git log --author=$(git config --get user.name) --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf "added lines: %s, removed lines: %s, total lines: %s\n", add, subs, loc }'