gitfiles/gitcli.sh at master · zyprex/gitfiles · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
: 'git_command_line_interface
 ----------------------------------------
 (Q)uit   (C)lear
 (s)tatus (d)iff (l)og (g)raph
 # (A)dd    (u)ndo
 # (Co)mmit (U)ndo (R)edo
 # (+P)ush
 # (B)ranch (t)o (M)erge (D)elete  (st)ash
 ----------------------------------------
'

head -8 $0
# loop here
while true ; do
    echo -n ">>"
    read key
    case $key in
        "Q"|"exit") break      ;;
        "C") clear; head -8 $0 ;;
        "s") git status        ;;
        "d") git diff --staged ;;
        "l") git log --abbrev-commit --date=format:'%Y-%m-%d %H:%M:%S' --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Cblue %s %Cgreen(%cd) %C(bold blue)<%an>%Creset';;
        "g") git log --graph ;;
        # "A") git add .  ;;
        # "u")
        #     echo -e "\033[4mgit reset HEAD^\033[0m"
        #     git reset HEAD^
        #     echo -e "TIPS: git checkout -- {yourfile}"
        #     ;;
        # "Co")
        #     echo -n "please give commit message: "
        #     read msg
        #     git commit -m"$msg"
        #     ;;
        # "U")
        #     echo -e "\033[4mgit reset --hard HEAD^\033[0m"
        #     git reset --hard HEAD^
        #     ;;
        # "R")
        #     echo -e "\033[4mgit reflog\033[0m"
        #     git reflog
        #     echo -n "commit id: "
        #     read dot
        #     git reset --hard $dot
        #     ;;
        # "+P")
        #     git push origin master
        #     ;;
        # "B")
        #     echo -n "new branch name: "
        #     read bname
        #     git branch $bname
        #     ;;
        # "t")
        #     git branch
        #     echo -n "to branch: "
        #     read bname
        #     git checkout $bname
        #     ;;
        # "M")
        #     git branch
        #     echo -n "merge branch to current branch: "
        #     read bname
        #     git merge $bname
        #     ;;
        # "D")
        #     git branch
        #     echo "use git branch -d {branch_name} delete branch"
        #     ;;
        # "st")
        #     echo "use (s)--stash (p)--stash pop (l)--list stash "
        #     read -n1 key
        #     echo
        #     case $key in
        #         "s") git stash      ;;
        #         "p") git stash pop  ;;
        #         "l") git stash list ;;
        #           *)                ;;
        #     esac
        #     ;;
        *)
            $key
            ;;
    esac
done

: '----------------------------------------
              git guide
 ----------------------------------------
 git add 把文件添加到仓库
 git commit -m "..." 把文件提交到仓库
 git reset --hard HEAD^  版本回退，HEAD^ 指向上个版本
 删除文件 git rm {yourfile}
 撤销修改
 其实是用版本库里的版本替换工作区的版本，
 无论工作区是修改还是删除，都可以“一键还原”。
 git checkout -- {yourfile}

 ~~~~~~~~~ remote guide ~~~~~~~~
 git remote add origin <your_git:account>
 错误提示：fatal: remote origin already exists.
 则使用 git remote rm origin
 git push origin master
 错误提示：error: failed to push some refs to
 错误原因：在推送前没有进行本地仓库和远程服务器的同步
 方法一 git push -f 强制推送，远端仓库被覆盖
 方法二 需先对本地和远程仓库进行整理合并
 git pull --rebase origin master
 git push -u origin master

'