git try1

最新推荐文章于 2023-08-29 13:01:31 发布

weixin_33804582

最新推荐文章于 2023-08-29 13:01:31 发布

阅读量1.4k

点赞数

文章标签： git 运维操作系统

原文链接：https://my.oschina.net/u/3127489/blog/1599837

版权

2019独角兽企业重金招聘Python工程师标准>>>

aa@USER-AK2DOCQM7G MINGW32 ~
$ pwd
/c/Users/aa

aa@USER-AK2DOCQM7G MINGW32 ~
$ git help git

aa@USER-AK2DOCQM7G MINGW32 ~
$ git config --global user.name pjc

aa@USER-AK2DOCQM7G MINGW32 ~
$ git config --global user.email pjc5211457.gmail.com

aa@USER-AK2DOCQM7G MINGW32 ~
$ d:
bash: d:: command not found

aa@USER-AK2DOCQM7G MINGW32 ~
$ cd d
bash: cd: d: No such file or directory

aa@USER-AK2DOCQM7G MINGW32 ~
$ cd d:

aa@USER-AK2DOCQM7G MINGW32 /d
$ pwd
/d

aa@USER-AK2DOCQM7G MINGW32 /d
$ mkdir learngit
mkdir: cannot create directory ‘learngit’: File exists

aa@USER-AK2DOCQM7G MINGW32 /d
$ cd learngit

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ pwd
/d/learngit

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ dir
ok.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ cat ok.txt
dfdffdf
aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git init
Reinitialized existing Git repository in D:/learngit/.git/

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls -ah
./ ../ .git/ ok.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls -h
ok.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls -a
./ ../ .git/ ok.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls
ok.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls -;
ls: cannot access '-': No such file or directory

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls -l
total 1
-rw-r--r-- 1 aa 197617 7 Dec 4 21:55 ok.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls -al
total 33
drwxr-xr-x 1 aa 197617 0 Dec 4 22:10 ./
drwxr-xr-x 1 aa 197617 0 Dec 24 16:19 ../
drwxr-xr-x 1 aa 197617 0 Dec 30 15:00 .git/
-rw-r--r-- 1 aa 197617 7 Dec 4 21:55 ok.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ vim readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git add readme.txt
warning: LF will be replaced by CRLF in readme.txt.
The file will have its original line endings in your working directory.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git commit -m
error: switch `m' requires a value
usage: git commit [<options>] [--] <pathspec>...

-q, --quiet suppress summary after successful commit
-v, --verbose show diff in commit message template

Commit message options
-F, --file <file> read message from file
--author <author> override author for commit
--date <date> override date for commit
-m, --message <message>
commit message
-c, --reedit-message <commit>
reuse and edit message from specified commit
-C, --reuse-message <commit>
reuse message from specified commit
--fixup <commit> use autosquash formatted message to fixup specified commit
--squash <commit> use autosquash formatted message to squash specified commit
--reset-author the commit is authored by me now (used with -C/-c/--amend)
-s, --signoff add Signed-off-by:
-t, --template <file>
use specified template file
-e, --edit force edit of commit
--cleanup <default> how to strip spaces and #comments from message
--status include status in commit message template
-S, --gpg-sign[=<key-id>]
GPG sign commit

Commit contents options
-a, --all commit all changed files
-i, --include add specified files to index for commit
--interactive interactively add files
-p, --patch interactively add changes
-o, --only commit only specified files
-n, --no-verify bypass pre-commit and commit-msg hooks
--dry-run show what would be committed
--short show status concisely
--branch show branch information
--porcelain machine-readable output
--long show status in long format (default)
-z, --null terminate entries with NUL
--amend amend previous commit
--no-post-rewrite bypass post-rewrite hook
-u, --untracked-files[=<mode>]
show untracked files, optional modes: all, normal, no. (Default: all)

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git commit -m "wrote a readme file"
[master 11122bf] wrote a readme file
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ man git
bash: man: command not found

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ help git
bash: help: no help topics match `git'. Try `help help' or `man -k git' or `info git'.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ man -k git
bash: man: command not found

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ info git
bash: info: command not found

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ vim readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

deleted: hi.txt
modified: readme.txt

no changes added to commit (use "git add" and/or "git commit -a")

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git diff readme.txt
diff --git a/readme.txt b/readme.txt
index fcd5818..5b5b78d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-git is a version control system
+git is a distributed version control system

git is free software

warning: LF will be replaced by CRLF in readme.txt.
The file will have its original line endings in your working directory.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git add readme.txt
warning: LF will be replaced by CRLF in readme.txt.
The file will have its original line endings in your working directory.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified: readme.txt

Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

deleted: hi.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git commit -m "add distributed"
[master 6716a72] add distributed
1 file changed, 1 insertion(+), 1 deletion(-)

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

deleted: hi.txt

no changes added to commit (use "git add" and/or "git commit -a")

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git commit -a
Aborting commit due to empty commit message.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ vim readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git add readme.txt
warning: LF will be replaced by CRLF in readme.txt.
The file will have its original line endings in your working directory.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git commit -m "append GPL"
[master c957cc8] append GPL
1 file changed, 1 insertion(+), 1 deletion(-)

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls -ah
./ ../ .git/ ok.txt readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git log
commit c957cc87574bf62daeeb9d8b8539414d8682061d
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:21:29 2017 +0800

append GPL

commit 6716a72020268c39c68af19c5c369698ef4eaaff
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:18:39 2017 +0800

add distributed

commit 11122bfaa74561beb12949cde7f1fc3192065446
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:08:55 2017 +0800

wrote a readme file

commit bf2f1170cd1d333725b0bc6c7dcef9d0eeb491b2
Author: pan <pjc5211457@gmail.com>

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git log
commit c957cc87574bf62daeeb9d8b8539414d8682061d
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:21:29 2017 +0800

append GPL

commit 6716a72020268c39c68af19c5c369698ef4eaaff
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:18:39 2017 +0800

add distributed

commit 11122bfaa74561beb12949cde7f1fc3192065446
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:08:55 2017 +0800

wrote a readme file

commit bf2f1170cd1d333725b0bc6c7dcef9d0eeb491b2
Author: pan <pjc5211457@gmail.com>
Date: Mon Dec 4 22:00:22 2017 +0800

hey this first time to commit

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git log --pretty oneline
fatal: ambiguous argument 'oneline': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git log --pretty=online
fatal: invalid --pretty format: online

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git log --pretty=oneline
c957cc87574bf62daeeb9d8b8539414d8682061d append GPL
6716a72020268c39c68af19c5c369698ef4eaaff add distributed
11122bfaa74561beb12949cde7f1fc3192065446 wrote a readme file
bf2f1170cd1d333725b0bc6c7dcef9d0eeb491b2 hey this first time to commit

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

deleted: hi.txt

no changes added to commit (use "git add" and/or "git commit -a")

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git reset --hard head^
HEAD is now at 6716a72 add distributed

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ cat readme.txt
git is a distributed version control system

git is free software

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git log
commit 6716a72020268c39c68af19c5c369698ef4eaaff
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:18:39 2017 +0800

add distributed

commit 11122bfaa74561beb12949cde7f1fc3192065446
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:08:55 2017 +0800

wrote a readme file

commit bf2f1170cd1d333725b0bc6c7dcef9d0eeb491b2
Author: pan <pjc5211457@gmail.com>
Date: Mon Dec 4 22:00:22 2017 +0800

hey this first time to commit

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git reset --hard c957
HEAD is now at c957cc8 append GPL

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ show
bash: show: command not found

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ?
bash: ?: command not found

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git reflog
c957cc8 HEAD@{0}: reset: moving to c957
6716a72 HEAD@{1}: reset: moving to head^
c957cc8 HEAD@{2}: commit: append GPL
6716a72 HEAD@{3}: commit: add distributed
11122bf HEAD@{4}: commit: wrote a readme file
bf2f117 HEAD@{5}: commit (initial): hey this first time to commit

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git help reflog

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git diff head -- readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ vim readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git add readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ vim readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git diff head -- readme.txt
diff --git a/readme.txt b/readme.txt
index 9702d87..3191328 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,6 @@
git is a distributed version control system

git is free software under the GPL
-
+ok,i know something about it now!!!
+i'm pjc

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified: readme.txt

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: readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git --checkout -- re
rebase remote request-pull
reflog repack reset
relink replace revert

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git --checkout -- re
rebase remote request-pull
reflog repack reset
relink replace revert

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git --checkout -- re
rebase remote request-pull
reflog repack reset
relink replace revert

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git --checkout -- readme.txt
Unknown option: --checkout
usage: git [--version] [--help] [-C <path>] [-c name=value]
[--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
[-p | --paginate | --no-pager] [--no-replace-objects] [--bare]
[--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
<command> [<args>]

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git checkout -- readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified: readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ cat c59
cat: c59: No such file or directory

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git log
commit c957cc87574bf62daeeb9d8b8539414d8682061d
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:21:29 2017 +0800
commit c957cc87574bf62daeeb9d8b8539414d8682061d
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:21:29 2017 +0800

append GPL

commit 6716a72020268c39c68af19c5c369698ef4eaaff
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:18:39 2017 +0800

add distributed

commit 11122bfaa74561beb12949cde7f1fc3192065446
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:08:55 2017 +0800

wrote a readme file

commit bf2f1170cd1d333725b0bc6c7dcef9d0eeb491b2
Author: pan <pjc5211457@gmail.com>
Date: Mon Dec 4 22:00:22 2017 +0800

hey this first time to commit

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ cat 6716a7202
cat: 6716a7202: No such file or directory

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified: readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git reset head readme.txt
Unstaged changes after reset:
M readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
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: readme.txt

no changes added to commit (use "git add" and/or "git commit -a")

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ cat readme.txt
git is a distributed version control system

git is free software under the GPL
ok,i know something about it now!!!

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ vim text.md

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
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: readme.txt

Untracked files:
(use "git add <file>..." to include in what will be committed)

text.md

no changes added to commit (use "git add" and/or "git commit -a")

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git checkout -- readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Untracked files:
(use "git add <file>..." to include in what will be committed)

text.md

nothing added to commit but untracked files present (use "git add" to track)

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git add text.md
warning: LF will be replaced by CRLF in text.md.
The file will have its original line endings in your working directory.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git commit -m "hi,i commit a text.md"
[master ebb100b] hi,i commit a text.md
1 file changed, 1 insertion(+)
create mode 100644 text.md

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
nothing to commit, working tree clean

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git rm text.md
rm 'text.md'

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

deleted: text.md

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls -ah
./ ../ .git/ hi.txt ok.txt readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ cat ok.txt
dfdffdf
aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git checkout -- text.md
error: pathspec 'text.md' did not match any file(s) known to git.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git log
commit ebb100b6a82adee2e00c8754922d7c282d3f48a0
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 16:17:40 2017 +0800

hi,i commit a text.md

commit c957cc87574bf62daeeb9d8b8539414d8682061d
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:21:29 2017 +0800

append GPL

commit 6716a72020268c39c68af19c5c369698ef4eaaff
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 15:18:39 2017 +0800

add distributed

commit 11122bfaa74561beb12949cde7f1fc3192065446
Author: pjc <pjc5211457.gmail.com>

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git reset ^C

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git reset ebb100b6
fatal: ambiguous argument 'reset': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git reflog
ebb100b HEAD@{0}: commit: hi,i commit a text.md
c957cc8 HEAD@{1}: reset: moving to c957
6716a72 HEAD@{2}: reset: moving to head^
c957cc8 HEAD@{3}: commit: append GPL
6716a72 HEAD@{4}: commit: add distributed
11122bf HEAD@{5}: commit: wrote a readme file
bf2f117 HEAD@{6}: commit (initial): hey this first time to commit

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

deleted: text.md

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git reset head text.md
Unstaged changes after reset:
D text.md

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls -ah
./ ../ .git/ hi.txt ok.txt readme.txt

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

deleted: text.md

no changes added to commit (use "git add" and/or "git commit -a")

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git checkout -- text.md

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ ls -ah
./ ../ .git/ hi.txt ok.txt readme.txt text.md

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ cat text.md
hi,i'll del it ,ok?

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
nothing to commit, working tree clean

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git rm text.md
rm 'text.md'

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

deleted: text.md

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git checkout -- text.md
error: pathspec 'text.md' did not match any file(s) known to git.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git reset head text.md
Unstaged changes after reset:
D text.md

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git status
On branch master
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

deleted: text.md

no changes added to commit (use "git add" and/or "git commit -a")

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$

-------

aa@USER-AK2DOCQM7G MINGW32 ~
$ pwd
/c/Users/aa

aa@USER-AK2DOCQM7G MINGW32 ~
$ ls -ah
./
../
.android/
.bash_history
.eclipse/
.gitconfig
.idlerc/
.p2/
.PyCharmCE2017.2/
.tooling/
.viminfo
「开始」菜单@
AppData/
'Application Data'@
Contacts/
Cookies/
Desktop/
Documents/
Downloads/
Favorites/
IntelGraphicsProfiles/
Links/
'Local Settings'@
Music/
'My Documents'@
NetHood@
NTUSER.DAT
ntuser.dat.LOG1
ntuser.dat.LOG2
NTUSER.DAT{6e8c8578-3f6e-11e6-a40d-9583e6 9e3f23}.TM.blf
NTUSER.DAT{6e8c8578-3f6e-11e6-a40d-9583e6 9e3f23}.TMContainer00000000000000000001.r egtrans-ms
NTUSER.DAT{6e8c8578-3f6e-11e6-a40d-9583e6 9e3f23}.TMContainer00000000000000000002.r egtrans-ms
ntuser.ini
OneDrive/
Pictures/
PrintHood@
Recent@
'Saved Games'/
Searches/
SendTo@
Templates@
Videos/

aa@USER-AK2DOCQM7G MINGW32 ~
$ ssh-keygen -t rsa -C "pjc5211457@gmail. com"
Generating public/private rsa key pair.
Enter file in which to save the key (/c/U sers/aa/.ssh/id_rsa):
Created directory '/c/Users/aa/.ssh'.
Enter passphrase (empty for no passphrase ):
Enter same passphrase again:
Your identification has been saved in /c/ Users/aa/.ssh/id_rsa.
Your public key has been saved in /c/User s/aa/.ssh/id_rsa.pub.
The key fingerprint is:
SHA256:9dFTCGI89Z3GRcY2yGYuIVIfQ3GlbFMoth jwY9RtTMI pjc5211457@gmail.com
The key's randomart image is:
+---[RSA 2048]----+
| .o+*BO++*=|
| .o++E*%===|
| .+*oX=+=o|
| .o.+.oo. |
| S o |
| |
| |
| |
| |
+----[SHA256]-----+

aa@USER-AK2DOCQM7G MINGW32 ~
$

aa@USER-AK2DOCQM7G MINGW32 ~
$ pwd
/c/Users/aa

aa@USER-AK2DOCQM7G MINGW32 ~
$ la -ah
bash: la: command not found

aa@USER-AK2DOCQM7G MINGW32 ~
$ ls -a -h
./
../
.android/
.bash_history
.eclipse/
.gitconfig
.idlerc/
.p2/
.PyCharmCE2017.2/
.ssh/
.tooling/
.viminfo
「开始」菜单@
AppData/
'Application Data'@
Contacts/
Cookies/
Desktop/
Documents/
Downloads/
Favorites/
IntelGraphicsProfiles/
Links/
'Local Settings'@
Music/
'My Documents'@
NetHood@
NTUSER.DAT
ntuser.dat.LOG1
ntuser.dat.LOG2
NTUSER.DAT{6e8c8578-3f6e-11e6-a40d-9583e6 9e3f23}.TM.blf
NTUSER.DAT{6e8c8578-3f6e-11e6-a40d-9583e6 9e3f23}.TMContainer00000000000000000001.r egtrans-ms
NTUSER.DAT{6e8c8578-3f6e-11e6-a40d-9583e6 9e3f23}.TMContainer00000000000000000002.r egtrans-ms
ntuser.ini
OneDrive/
Pictures/
PrintHood@
Recent@
'Saved Games'/
Searches/
SendTo@
Templates@
Videos/

aa@USER-AK2DOCQM7G MINGW32 ~
$ cat .ssh/
cat: .ssh/: Is a directory

aa@USER-AK2DOCQM7G MINGW32 ~
$ cd .ssh

aa@USER-AK2DOCQM7G MINGW32 ~/.ssh
$ dir
id_rsa id_rsa.pub

aa@USER-AK2DOCQM7G MINGW32 ~/.ssh
$ cat id_rsa
-----BEGIN RSA PRIVATE KEY-----
MIIEogIBAAKCAQEA3vJfk/3LHGFpU5/hJTIZgt9ci DekM2r5HxLgyrkxCnmGOq3f
Ek9vJUcfwKN9qsjGHDAISjSPYExAw9UZ2bzYcIoOI 19WWPx5aSV8N2hwPDk6k9/Y
RtPRlEps/WWtzhRcTyuSzIWVjoB36q9bLyQ6Ih3Ad FV5C4hMj9i8ct0lqxYkCf5v
jes+0M89EuakNYMKmhRwVDcBJwVYbtQEqNA0XsNXn uM2+hpNV1zymzZVUbmy9/ym
TZeCjqYNgWfp2GhH9cSQXFAPSdg1GRCfol5xbMFmR oSPHTDVn4YCjzApNtf8hOWJ
d8+xzHjKfHU9fOlrKEzlqznMCqpV8K+4uedkewIDA QABAoIBAH7a1jt0yx8o5i9o
50isywtGYHY5grqnAX0G1tVCrn7RSukUibr3a7yAT bbkz9pfRyo+wljGs1YNzUQg
ewcDhvvx8b16v7z+W27Sn20/ha0euw/s7DjQyY1hE 8bTFiQOPb/mgS7SS5i7zH/C
q1WVfWZwG1OWVruTIE0w+3k4D/jaHiQH4FZgrkNu9 +KrJfPsFZ9DDvm2Sp7EwAxP
EaowBUFVmaZ+KPBKnzFaGbD31hp4uPpxihu2mYLMk umaw1c2BINdzstPpQHmXQd/
HKcYr392iBrrv5AvMIjSlQIZbQzzK2bfNdaA2KMo0 7SNTDzNqSraB2MpZO4r7Xc5
jXvguGECgYEA+WgtTUte+1Qco4beJi44Vu+J1awbj +5XX7HgpJUthbqc0mdWskNe
4qWkpOv0JFN2m2MS2ow3fsdG2i/wyKwnKCV1Gup7M 3JOIeaBFML48HTCjDrVTuad
2fUtd3q0/602azU4kzTBz1dqk3e5OSKyq4jmRHgpc sj6sZcUeVbagxMCgYEA5Nch
mqiVfGXpJ5axyBwCrRuM2rBrRHsm41pVInlrdotAb 6/22WKOHE79okhsJMHpfhHe
U9Ay5w8uK/ws6Ub91Zekv/Ntk+0Zob7h80MYn8rEm O1M8+2z47TCaw5zV4R+mCYK
mOJ4nZKbTP25ouF/me3/iqHuF1O4wufUsKNAXfkCg YAIFzcRANbt9EaRj3h5aJpv
R4oDIngqbSLsecq9zBET+3/G249WbRUQ6Sq0Jutem k6Ir+gWquHJ/RDxVwjKmbsT
dFOeMekZPCYIt3+Met60fjUpc2ckDhskzO1SqOpiO O5BABL7w4ReA4nziri5f8So
B+Lgab1+ecKYLDx/yy9/fQKBgH68xteo1mF275IFW 6DAIptMzs2vNzlOG1N/C/dz
15hntuAkTEpI0vvKo53lDj+tRWuU6dTxUb+2IJQrr ZPkxWAuBAhrAR0UC0YROYJI
frLA0fEAO8Y8t4w86A/yiN7HenU5XFUf2D0snOYe/ 1i+GrVdolFdLUeuDn2jd5/8
SgHBAoGAFxm3k4ey2VRBE5ybvxcI7MYwJjtZ/YNsX 64ffeMPMD1fmHoQY3O3lz97
5hGdNt20rvqorwJCoxyohDgP2DvE/MANJgxULfSKz 71YVx+I4m5n7+Vr9xArb0QS
2fEyRyqrB5t4uF6h0DxTg26S3J3aCl0hkqOJcfbP7 0HuhuguK9o=
-----END RSA PRIVATE KEY-----

aa@USER-AK2DOCQM7G MINGW32 ~/.ssh
$ dir
id_rsa id_rsa.pub

aa@USER-AK2DOCQM7G MINGW32 ~/.ssh
$ cd id_rsa.pub
bash: cd: id_rsa.pub: Not a directory

aa@USER-AK2DOCQM7G MINGW32 ~/.ssh
$ cat id_rsa
id_rsa id_rsa.pub

aa@USER-AK2DOCQM7G MINGW32 ~/.ssh
$ cat id_rsa.pub
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDe8 l+T/cscYWlTn+ElMhmC31yIN6QzavkfEuDKuTEKeY Y6rd8ST28lRx/Ao32qyMYcMAhKNI9gTEDD1RnZvNh wig4jX1ZY/HlpJXw3aHA8OTqT39hG09GUSmz9Za3O FFxPK5LMhZWOgHfqr1svJDoiHcB0VXkLiEyP2Lxy3 SWrFiQJ/m+N6z7Qzz0S5qQ1gwqaFHBUNwEnBVhu1A So0DRew1ee4zb6Gk1XXPKbNlVRubL3/KZNl4KOpg2 BZ+nYaEf1xJBcUA9J2DUZEJ+iXnFswWZGhI8dMNWf hgKPMCk21/yE5Yl3z7HMeMp8dT186WsoTOWrOcwKq lXwr7i552R7 pjc5211457@gmail.com

aa@USER-AK2DOCQM7G MINGW32 ~/.ssh
$ dir
id_rsa id_rsa.pub

aa@USER-AK2DOCQM7G MINGW32 ~/.ssh
$ cd d:

aa@USER-AK2DOCQM7G MINGW32 /d
$ ls -l
total 4173
drwxr-xr-x 1 aa 197617 0 Oct 13 14: 12 '$RECYCLE.BIN'/
drwxr-xr-x 1 aa 197617 0 Dec 23 15: 10 360browse/
drwxr-xr-x 1 aa 197617 0 Aug 26 18: 37 360Downloads/
drwxr-xr-x 1 aa 197617 0 Dec 29 18: 39 360安全浏览器下载/
drwxr-xr-x 1 aa 197617 0 Aug 26 15: 06 360极速浏览器下载/
drwxr-xr-x 1 aa 197617 0 Aug 26 15: 28 360驱动大师目录/
drwxr-xr-x 1 aa 197617 0 Nov 5 11: 59 adobe/
-r--r--r-- 1 aa 197617 45 Nov 6 20 02 autorun.inf
drwxr-xr-x 1 aa 197617 0 Sep 2 16: 03 BaiduYunDownload/
-r--r--r-- 1 aa 197617 58766 Mar 28 20 02 banner.bmp
drwxr-xr-x 1 aa 197617 0 Dec 4 20 16 BB/
drwxr-xr-x 1 aa 197617 0 Jan 23 20 17 CloudMusic/
drwxr-xr-x 1 aa 197617 0 Dec 16 18: 36 code/
drwxr-xr-x 1 aa 197617 0 Feb 27 20 17 common/
-rw-r--r-- 1 aa 197617 0 Nov 2 20 15 D2.ASP
drwxr-xr-x 1 aa 197617 0 Oct 26 19: 33 dev/
drwxr-xr-x 1 aa 197617 0 Sep 13 19: 34 doc/
drwxr-xr-x 1 aa 197617 0 Nov 8 20 15 douyouwang.apk.sytmp/
drwxr-xr-x 1 aa 197617 0 Aug 27 12: 21 DTLFolder/
drwxr-xr-x 1 aa 197617 0 Dec 27 22: 41 ee/
drwxr-xr-x 1 aa 197617 0 Oct 22 18: 33 fire/
drwxr-xr-x 1 aa 197617 0 Dec 22 19: 42 hyxd/
drwxr-xr-x 1 aa 197617 0 Jul 25 13: 18 JisuPdfEditor/
drwxr-xr-x 1 aa 197617 0 Aug 27 14: 25 kankan/
drwxr-xr-x 1 aa 197617 0 Sep 5 11: 57 KuGou/
drwxr-xr-x 1 aa 197617 0 Dec 30 16: 52 learngit/
-r-xr-xr-x 1 aa 197617 6512 Mar 12 20 03 libatriagu.dll*
drwxr-xr-x 1 aa 197617 0 Dec 23 12: 53 lingoes/
drwxr-xr-x 1 aa 197617 0 Dec 18 20 12 Meitu/
-r-xr-xr-x 1 aa 197617 995383 Jul 15 20 00 mfc42.dll*
-rw-r--r-- 1 aa 197617 155335 Mar 18 20 03 miniBom.xml
drwxr-xr-x 1 aa 197617 0 Feb 27 20 17 musictest/
drwxr-xr-x 1 aa 197617 0 Nov 19 21: 57 my/
drwxr-xr-x 1 aa 197617 0 Nov 5 11: 34 MyDrivers/
drwxr-xr-x 1 aa 197617 0 Jun 4 20 17 opera/
drwxr-xr-x 1 aa 197617 0 Nov 10 15: 14 oulu/
drwxr-xr-x 1 aa 197617 0 Jul 9 20 16 PhoneDetect.zip.sytmp/
drwxr-xr-x 1 aa 197617 0 Nov 27 17: 17 pips/
drwxr-xr-x 1 aa 197617 0 Aug 27 12: 22 'Program Files'/
drwxr-xr-x 1 aa 197617 0 Nov 28 20: 51 py/
drwxr-xr-x 1 aa 197617 0 Nov 27 21: 00 pycharm/
drwxr-xr-x 1 aa 197617 0 Dec 24 16: 19 pygamecode/
drwxr-xr-x 1 aa 197617 0 Mar 16 20 17 QQMusicCache/
drwxr-xr-x 1 aa 197617 0 Dec 24 09: 31 qycache/
drwxr-xr-x 1 aa 197617 0 Feb 27 20 17 'Rational Test'/
-r--r--r-- 1 aa 197617 4315 Mar 11 20 03 readme.htm
drwxr-xr-x 1 aa 197617 0 Feb 27 20 17 RequisitePro/
drwxr-xr-x 1 aa 197617 0 Feb 27 20 17 Rose/
drwxr-xr-x 1 aa 197617 0 Feb 27 20 17 SETUP/
-r-xr-xr-x 1 aa 197617 1294336 Mar 16 20 03 setup.exe*
drwxr-xr-x 1 aa 197617 0 Feb 27 20 17 SITEPREP/
-r-xr-xr-x 1 aa 197617 1179648 Mar 16 20 03 siteprep.exe*
drwxr-xr-x 1 aa 197617 0 Dec 24 13: 42 steam/
-r--r--r-- 1 aa 197617 8854 Sep 30 20 02 suite.ico
drwxr-xr-x 1 aa 197617 0 Aug 26 14: 36 'System Volume Information'/
drwxr-xr-x 1 aa 197617 0 Dec 2 15: 20 tor/
drwxr-xr-x 1 aa 197617 0 Nov 19 19: 28 'Tor Browser'/
drwxr-xr-x 1 aa 197617 0 Nov 3 21: 16 Typeeasy/
drwxr-xr-x 1 aa 197617 0 Sep 22 16: 47 vm_share/
drwxr-xr-x 1 aa 197617 0 Sep 22 16: 53 vm10/
drwxr-xr-x 1 aa 197617 0 Dec 6 17: 53 WindowsApps/
drwxr-xr-x 1 aa 197617 0 Oct 13 14: 11 WpSystem/
drwxr-xr-x 1 aa 197617 0 Dec 8 13: 13 WUDownloadCache/
drwxr-xr-x 1 aa 197617 0 Apr 15 20 17 'Youku Files'/
drwxr-xr-x 1 aa 197617 0 Mar 17 20 17 姐姐的/
drwxr-xr-x 1 aa 197617 0 Sep 19 12: 50 文件集合/

aa@USER-AK2DOCQM7G MINGW32 /d
$ mkdir git

aa@USER-AK2DOCQM7G MINGW32 /d
$ cd git

aa@USER-AK2DOCQM7G MINGW32 /d/git
$ mkdir try

aa@USER-AK2DOCQM7G MINGW32 /d/git
$ cd try

aa@USER-AK2DOCQM7G MINGW32 /d/git/try
$ ls -l
total 0

aa@USER-AK2DOCQM7G MINGW32 /d/git/try
$ git init
Initialized empty Git repository in D:/gi t/try/.git/

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (ma ster)
$ vim readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (ma ster)
$ git add readme.md
warning: LF will be replaced by CRLF in r eadme.md.
The file will have its original line endi ngs in your working directory.

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (ma ster)
$ git status
On branch master

Initial commit

Changes to be committed:
(use "git rm --cached <file>..." to uns tage)

new file: readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (ma ster)
$ git commit -m "this is first readme doc "
[master (root-commit) cdfadbd] this is fi rst readme doc
1 file changed, 5 insertions(+)
create mode 100644 readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (ma ster)
$ git status
On branch master
nothing to commit, working tree clean

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (ma ster)
$ git remote add origin git@github.com:pa ngerger/try.git

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (ma ster)
$ git push -u origin master
The authenticity of host 'github.com (192.30.255.112)' can't be established.
RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8.
Are you sure you want to continue connecting (yes/no)? y
Please type 'yes' or 'no': yes
Warning: Permanently added 'github.com,192.30.255.112' (RSA) to the list of known hosts.
Counting objects: 3, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 310 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To github.com:pangerger/try.git
* [new branch] master -> master
Branch master set up to track remote branch master from origin.

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ pwd
/d/git/try

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ cd /d/learngit/

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git remote add origin git @github.com:pangerer/learngit.git
usage: git remote add [<options>] <name> <url>

-f, --fetch fetch the remote branches
--tags import all tags and associated objects when fetching
or do not fetch any tag at all (--no-tags)
-t, --track <branch> branch(es) to track
-m, --master <branch>
master branch
--mirror[=<push|fetch>]
set up remote as a mirror to push to or fetch from

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git remote add origin git@github.com:pangerer/learngit.git

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git push -u origin master
ERROR: Repository not found.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git remote add origin git@github.com:pangerger/learngit.git
fatal: remote origin already exists.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ git push -u origin master
Warning: Permanently added the RSA host key for IP address '192.30.255.113' to the list of known hosts.
ERROR: Repository not found.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

aa@USER-AK2DOCQM7G MINGW32 /d/learngit (master)
$ cd /d/git/try

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ pwd
/d/git/try

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ cd ..

aa@USER-AK2DOCQM7G MINGW32 /d/git
$ pws
bash: pws: command not found

aa@USER-AK2DOCQM7G MINGW32 /d/git
$ mkdir clone

aa@USER-AK2DOCQM7G MINGW32 /d/git
$ cd clone/

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone
$ mkdir aclib

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone
$ pwd
/d/git/clone

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone
$ mkdir ACLLib

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone
$ cd acl
bash: cd: acl: No such file or directory

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone
$ cd ACLLib/

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib
$ git clone git@github.com:pangerger/ACLLib.git
Cloning into 'ACLLib'...
remote: Counting objects: 138, done.
remote: Total 138 (delta 0), reused 0 (delta 0), pack-reused 138
Receiving objects: 100% (138/138), 1.84 MiB | 249.00 KiB/s, done.
Resolving deltas: 100% (51/51), done.

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib
$ ls -ah
./ ../ ACLLib/

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib
$ pwd
/d/git/clone/ACLLib

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (master)
$ ls -ah
./ ../ .git/ .gitattributes .gitignore doc/ README.md samples/ src/

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (master)
$ cat README.md
ACLLib
======
ACLLib is a bunch of C functions covers Win32API and provides simpler API to beginners for programming Windows GUI applications. It compiles with MinGW and MS Visual Studio Express.

https://github.com/wengkai/ACLLib/wiki
aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (master)
$ dir
doc README.md samples src

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (master)
$ cd doc

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib/doc (master)
$ dir
acllib_doc.pdf acllib_vs_config.pdf

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib/doc (master)
$ cd ..

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (master)
$ dir
doc README.md samples src

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (master)
$ cd src

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib/src (master)
$ dir
acllib.c acllib.h

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib/src (master)
$ cat acllib.h
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

// ACLLib - Advanced C Lab Library
// Ver 2014-07
// For students' Lab at Zhejiang University
// Created 2008 by Gao Yuan
// Modified 2009 by Cui Liwei
// 2010 by Lan Huidong
// Revised 2012 by Li Rui
// Modified 2014 by Weng Kai for MOOC

/*
For Dev C++, these lib files need to be added into linker options.
Be sure to change the leading folders as your installation.
"C:/Program Files/Dev-Cpp/MinGW32/lib/libwinmm.a"
"C:/Program Files/Dev-Cpp/MinGW32/lib/libmsimg32.a"
"C:/Program Files/Dev-Cpp/MinGW32/lib/libkernel32.a"
"C:/Program Files/Dev-Cpp/MinGW32/lib/libuser32.a"
"C:/Program Files/Dev-Cpp/MinGW32/lib/libgdi32.a"
"C:/Program Files/Dev-Cpp/MinGW32/lib/libole32.a"
"C:/Program Files/Dev-Cpp/MinGW32/lib/liboleaut32.a"
"C:/Program Files/Dev-Cpp/MinGW32/lib/libuuid.a"
*/

#ifndef __ACLLIB_H__
#define __ACLLIB_H__

#ifdef _UNICODE
#undef _UNICODE
#endif
#ifdef UNICODE
#undef UNICODE
#endif

#include <Windows.h>

#define BLACK RGB(0, 0, 0)
#define RED RGB(255, 0, 0)
#define GREEN RGB(0, 255, 0)
#define BLUE RGB(0, 0, 255)
#define CYAN RGB(0, 255, 255)
#define MAGENTA RGB(255, 0, 255)
#define YELLOW RGB(255, 255, 0)
#define WHITE RGB(255, 255, 255)

#define EMPTY 0xffffffff
#define DEFAULT -1

typedef enum
{
PEN_STYLE_SOLID,
PEN_STYLE_DASH, /* ------- */
PEN_STYLE_DOT, /* ....... */
PEN_STYLE_DASHDOT, /* _._._._ */
PEN_STYLE_DASHDOTDOT, /* _.._.._ */
PEN_STYLE_NULL
} ACL_Pen_Style;

typedef enum
{
BRUSH_STYLE_SOLID = -1,
BRUSH_STYLE_HORIZONTAL, /* ----- */
BRUSH_STYLE_VERTICAL, /* ||||| */
BRUSH_STYLE_FDIAGONAL, /* \\\\\ */
BRUSH_STYLE_BDIAGONAL, /* / */
BRUSH_STYLE_CROSS, /* +++++ */
BRUSH_STYLE_DIAGCROSS, /* xxxxx */
BRUSH_STYLE_NULL
} ACL_Brush_Style;

typedef enum
{
NO_BUTTON = 0,
LEFT_BUTTON,
MIDDLE_BUTTON,
RIGHT_BUTTON
} ACL_Mouse_Button;

typedef enum
{
BUTTON_DOWN,
BUTTON_DOUBLECLICK,
BUTTON_UP,
ROLL_UP,
ROLL_DOWN,
MOUSEMOVE
} ACL_Mouse_Event;

typedef enum
{
KEY_DOWN,
KEY_UP
} ACL_Keyboard_Event;

typedef struct
{
HBITMAP hbitmap;
int width;
int height;
} ACL_Image;

//typedef enum
//{
// TM_NO = 0x00,
// TM_COLOR = 0x01,
// TM_ALPHA = 0x02
//} ACL_TransparentMode;

typedef COLORREF ACL_Color;
typedef int ACL_Sound;

typedef void(*KeyboardEventCallback) (int key, int event);
typedef void(*CharEventCallback) (char c);
typedef void(*MouseEventCallback) (int x, int y, int button, int event);
typedef void(*TimerEventCallback) (int timerID);

#ifdef __cplusplus
extern "C" {
#endif

int Setup(void);

//
void initWindow(const char title[], int left, int top, int width, int height);
void msgBox(const char title[], const char text[], int flag);

void registerKeyboardEvent(KeyboardEventCallback callback);
void registerCharEvent(CharEventCallback callback);
void registerMouseEvent(MouseEventCallback callback);
void registerTimerEvent(TimerEventCallback callback);

void startTimer(int timerID, int timeinterval);
void cancelTimer(int timerID);

// Sound
void loadSound(const char *fileName, ACL_Sound *pSound);
void playSound(ACL_Sound soundID, int repeat);
void stopSound(ACL_Sound soundID);

// Paint
void beginPaint();
void endPaint();
void clearDevice(void);
int getWidth();
int getHeight();

// Pen
void setPenColor(ACL_Color color);
void setPenWidth(int width);
void setPenStyle(ACL_Pen_Style style);

// Brush
void setBrushColor(ACL_Color color);
void setBrushStyle(ACL_Brush_Style style);

// Text
void setTextColor(ACL_Color color);
void setTextBkColor(ACL_Color color);
void setTextSize(int size);
void setTextFont(const char *pFontName);

void paintText(int x, int y, const char *pStr);

void setCaretSize(int w, int h);
void setCaretPos(int x, int y);
void showCaret();
void hideCaret();

// Pixel
void putPixel(int x, int y, ACL_Color color);
ACL_Color getPixel(int x, int y);

// the Point
int getX(void);
int getY(void);
void moveTo(int x, int y);
void moveRel(int dx, int dy);

// Lines and Curves
void arc(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, \
int nXStartArc, int nYStartArc, int nXEndArc, int nYEndArc);
void line(int x0, int y0, int x1, int y1);
void lineTo(int nXEnd, int nYEnd);
void lineRel(int dx, int dy);
void polyBezier(const POINT *lppt, int cPoints);
void polyLine(const POINT *lppt, int cPoints);

// Filled Shapes
void chrod(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, \
int nXRadial1, int nYRadial1, int nXRadial2, int nYRadial2);
void ellipse(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
void pie(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, \
int nXRadial1, int nYRadial1, int nXRadial2, int nYRadial2);
void polygon(const POINT *lpPoints, int nCount);
void rectangle(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
void roundrect(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, \
int nWidth, int nHeight);

// Image
void loadImage(const char *pImageFileName, ACL_Image *pImage);
void freeImage(ACL_Image *pImage);

void putImage(ACL_Image *pImage, int x, int y);
void putImageScale(ACL_Image *pImage, int x, int y, int width, int height);
void putImageTransparent(ACL_Image *pImage, int x, int y, int width, int height, ACL_Color bkColor);

//void putImageEx(ACL_Image *pImage,int dx,int dy,int dw,int dh,
// int sx,int sy,int sw,int sh);

//void setTransparentMode(ACL_TransparenetMode);
//void setTransparentColor(ACL_Color);
//void setTransparetnAlpha(int alpha);

void initConsole(void);

#ifdef __cplusplus
}
#endif

#endif

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib/src (master)
$ pwd
/d/git/clone/ACLLib/src

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib/src (master)
$ cd ..

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (master)
$ git branch -b newone
error: unknown switch `b'
usage: git branch [<options>] [-r | -a] [--merged | --no-merged]
or: git branch [<options>] [-l] [-f] <branch-name> [<start-point>]
or: git branch [<options>] [-r] (-d | -D) <branch-name>...
or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
or: git branch [<options>] [-r | -a] [--points-at]

Generic options
-v, --verbose show hash and subject, give twice for upstream branch
-q, --quiet suppress informational messages
-t, --track set up tracking mode (see git-pull(1))
--set-upstream change upstream info
-u, --set-upstream-to <upstream>
change the upstream info
--unset-upstream Unset the upstream info
--color[=<when>] use colored output
-r, --remotes act on remote-tracking branches
--contains <commit> print only branches that contain the commit
--abbrev[=<n>] use <n> digits to display SHA-1s

Specific git-branch actions:
-a, --all list both remote-tracking and local branches
-d, --delete delete fully merged branch
-D delete branch (even if not merged)
-m, --move move/rename a branch and its reflog
-M move/rename a branch, even if target exists
--list list branch names
-l, --create-reflog create the branch's reflog
--edit-description edit the description for the branch
-f, --force force creation, move/rename, deletion
--merged <commit> print only branches that are merged
--no-merged <commit> print only branches that are not merged
--column[=<style>] list branches in columns
--sort <key> field name to sort on
--points-at <object> print only branches of the object

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (master)
$ git branch newone

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (master)
$ git checkout newone
Switched to branch 'newone'

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (newone)
$ git branch
master
* newone

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (newone)
$ info merge
bash: info: command not found

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (newone)
$ info git merge
bash: info: command not found

aa@USER-AK2DOCQM7G MINGW32 /d/git/clone/ACLLib (newone)
$ cd /d/git/try

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git branch firstb

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git checkout firstb
Switched to branch 'firstb'

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ git branch
* firstb
master

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ ls
readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ vim readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ git status
On branch firstb
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: readme.md

no changes added to commit (use "git add" and/or "git commit -a")

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ git add readme.md
warning: LF will be replaced by CRLF in readme.md.
The file will have its original line endings in your working directory.

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ git commit -m "new branch in firstb"
[firstb be53944] new branch in firstb
1 file changed, 1 insertion(+), 1 deletion(-)

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ git log
commit be5394427049f946034bee7ca1e2dfe909a82125
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 20:39:37 2017 +0800

new branch in firstb

commit cdfadbd8d76e38fc1b27a687b3d65fb8c2c845d0
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 19:30:58 2017 +0800

this is first readme doc

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ git reflog
be53944 HEAD@{0}: commit: new branch in firstb
cdfadbd HEAD@{1}: checkout: moving from master to firstb
cdfadbd HEAD@{2}: commit (initial): this is first readme doc

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ vim readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
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: readme.md

no changes added to commit (use "git add" and/or "git commit -a")

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git diff
diff --git a/readme.md b/readme.md
index f03c2b1..8bfde02 100644
--- a/readme.md
+++ b/readme.md
@@ -2,4 +2,4 @@ ok,i know i have many things to do

but i like to use git is really ,yeah!so i 'm try for my best effort
yeah,this is use vim!!!
-
+.ok

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git add readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified: readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git diff

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git commit -m "yeah i modified the readme.md"
[master 085d59d] yeah i modified the readme.md
1 file changed, 1 insertion(+), 1 deletion(-)

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git merge firstb
Auto-merging readme.md
CONFLICT (content): Merge conflict in readme.md
Automatic merge failed; fix conflicts and then commit the result.

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master|MERGING)
$ git diff
diff --cc readme.md
index 8bfde02,e75c773..0000000
--- a/readme.md
+++ b/readme.md
@@@ -2,4 -2,4 +2,8 @@@ ok,i know i have many things to d

but i like to use git is really ,yeah!so i 'm try for my best effort
yeah,this is use vim!!!
++<<<<<<< HEAD
+.ok
++=======
+ ,yeah
++>>>>>>> firstb

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master|MERGING)
$ vim readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master|MERGING)
$ git log --graph
* commit 085d59d2eff19da3ba6e67a9263dbecf6cbad377
| Author: pjc <pjc5211457.gmail.com>
| Date: Sat Dec 30 20:44:38 2017 +0800
|
| yeah i modified the readme.md
|
* commit cdfadbd8d76e38fc1b27a687b3d65fb8c2c845d0
Author: pjc <pjc5211457.gmail.com>
Date: Sat Dec 30 19:30:58 2017 +0800

this is first readme doc

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master|MERGING)
$ git log --graph --pretty=oneline
* 085d59d2eff19da3ba6e67a9263dbecf6cbad377 yeah i modified the readme.md
* cdfadbd8d76e38fc1b27a687b3d65fb8c2c845d0 this is first readme doc

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master|MERGING)
$ git add readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master|MERGING)
$ git commit -m "in order to fix the conflict"
[master 4105e57] in order to fix the conflict

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git merge firstb
Already up-to-date.

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git branch firstb
fatal: A branch named 'firstb' already exists.

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git checkout firstb
Switched to branch 'firstb'

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ vim readme.md

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (firstb)
$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 3 commits.
(use "git push" to publish your local commits)

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 3 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git log --graph --pretty=oneline --abbrev-commit
* 4105e57 in order to fix the conflict
|\
| * be53944 new branch in firstb
* | 085d59d yeah i modified the readme.md
|/
* cdfadbd this is first readme doc

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git branch -d firstb
Deleted branch firstb (was be53944).

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$ git branch
* master

aa@USER-AK2DOCQM7G MINGW32 /d/git/try (master)
$