this repo is to test git

initialize a git

vim a.cpp
git init
git add .
git commit -m "initial commit"

branch

git branch main
git checkout main
git branch -M test_main # rename main branch

# create a c program here
git add .
git commit -m "xxx"


git checkout master
git branch addreadme
git checkout addreadme
vim README.md
git add .
git commit -m "xxx"

切换分支时如果有更改, 需要先 git commit, 或者 git stash

create a c program

mkdir build
mkdir src
mkdir include
vim CMakeLists.txt
cd include
vim b.h
cd ../src
vim b.cpp
vim a.cpp
cd ../build
cmake ..
make

connect to remote repo

ssh-keygen -t rsa -b 4096 -C "email@outlook.com"
ssh-keygen -t ed25519 -C "email@zju.edu.cn" # can use different publickey name

git remote add origin git@github.com:AKonjac0/gittest.git
git remote add vice git@github.com:AKonjac0/testgit.git

git checkout master
git push origin master

git checkout test_main
git push origin test_main

git checkout addreadme
git push vice addreadme

至此 git log --graph --oneline --all:

* 2ffc18a (HEAD -> addreadme, vice/addreadme) [feat] modify README.md: add initialization, ssh, branch and remote
* 127cab9 (origin/addreadme) [feat] add README.md
| * f5663d1 (origin/test_main, test_main) [feat] add directories and modify CMakeLists.txt
| * c7cc3e4 add module b and CMake
|/
* 76de40c (origin/master, master) initial commit

merge

git checkout test_main
git merge addreadme # no conflict, directly merge

create conflict and merge

git checkout test_main
vim .gitignore
git add .
git commit -m "xxx"

git checkout addgitignore
vim .gitignore
git add .
git commit -m "[feat] add more ignore files"

git checkout test_main
git merge addgitignore

此时显示 CONFLICT

查看 git diff addgitignore

alt text

需要解决冲突

手动解决冲突后:

git add .
git commit -m "[merge] xxx"

commit 后自动 merge

*   92fab8b (HEAD -> test_main) [merge] merge with addgitignore
|\
| * ed30eb4 (addgitignore) [feat] add more ignore files
* |   9e15627 [fix] fix gcd bug: gcd(b, a - b) -> gcd(b, a % b)
|\ \
| * | 106310e (origin/mathlib, mathlib) [feat] add math.cpp: add gcd
* | | fc64b4e (origin/test_main) [feat] add math.cpp
* | | 249ba41 [feat]: restore gitignore
* | |   6dded68 [feat]: add image to README.md
|\ \ \
| | |/
| |/|
| * | 97581f4 [feat] add gitignore
| |/
* / 2ae950b [feat] add .gitignore
|/
*   edbe3a3 Merge branch 'addreadme' into test_main add README.md by AKonjac0
|\
| * bfae278 (origin/addreadme, addreadme) [feat] modify README.md: add git log
| * 2ffc18a (vice/addreadme) [feat] modify README.md: add initialization, ssh, branch and remote
| * 127cab9 [feat] add README.md
* | f5663d1 [feat] add directories and modify CMakeLists.txt
* | c7cc3e4 add module b and CMake
|/
* 76de40c (origin/master, master) initial commit

alt text

reflog, stash, revert, reset, rebase

先 commit 一个新 fix, 用 git reflog 查看

alt text

再随便改一些文件, 比如 math.cpp

double square_root(double x){
    return std::sqrt(x);
}

此时尝试 git revert 0807098, 会说需要 commit 或 stash

我们尝试 stash

alt text

stash 后当前的更改会消失, 工作区被恢复到 0807098 的样子; 同时出现一个 index + refs/stash 的已 merge 后的结构

再 revert

alt text

reset 可以在多个 commit 之间跳跃

甚至可以 merge 两个 stash 版本

alt text

rebase 时如果出现冲突, 也需要手动解决冲突, 之后使用 git add . 并 git rebase --continue

一个复杂的 rebase 过程如下:

yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git rebase addgitignore
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
error: could not apply 2ae950b... [feat] add .gitignore
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2ae950b... [feat] add .gitignore
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git add .
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git log --graph --oneline --all
*   20294b3 (refs/stash, test_main) WIP on test_main: 98c8e55 [merge] merge two stashes
|\
| * c5da711 index on test_main: 98c8e55 [merge] merge two stashes
|/
*   98c8e55 [merge] merge two stashes
|\
| *   6a1ee02 WIP on test_main: 6dcd099 [feat] modify mathlib
| |\
| | * 2d36d7a index on test_main: 6dcd099 [feat] modify mathlib
| |/
* |   9bce2af WIP on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
|\ \
| * | 542e4b2 index on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
|/ /
* / 82d209a Revert "[reset] from 17dc5cb to 0807098"
|/
* 6dcd099 (origin/test_main) [feat] modify mathlib
* ab1b885 [reset] from 17dc5cb to 0807098
* 0807098 [fix] fix cmake, now you can build GT in build
*   92fab8b (vice/test_main) [merge] merge with addgitignore
|\
| * ed30eb4 (HEAD, origin/addgitignore, addgitignore) [feat] add more ignore files
* |   9e15627 [fix] fix gcd bug: gcd(b, a - b) -> gcd(b, a % b)
|\ \
| * | 106310e (origin/mathlib, mathlib) [feat] add math.cpp: add gcd
* | | fc64b4e [feat] add math.cpp
* | | 249ba41 [feat]: restore gitignore
* | |   6dded68 [feat]: add image to README.md
|\ \ \
| | |/
| |/|
| * | 97581f4 [feat] add gitignore
| |/
* / 2ae950b [feat] add .gitignore
|/
*   edbe3a3 Merge branch 'addreadme' into test_main add README.md by AKonjac0
|\
| * bfae278 (origin/addreadme, addreadme) [feat] modify README.md: add git log
| * 2ffc18a (vice/addreadme) [feat] modify README.md: add initialization, ssh, branch and remote
| * 127cab9 [feat] add README.md
* | f5663d1 [feat] add directories and modify CMakeLists.txt
* | c7cc3e4 add module b and CMake
|/
* 76de40c (origin/master, master) initial commit
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git rebase --continue
[detached HEAD ca2e160] [feat] add .gitignore
 2 files changed, 14 insertions(+), 1 deletion(-)
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
error: could not apply 249ba41... [feat]: restore gitignore
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 249ba41... [feat]: restore gitignore
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git log --graph --oneline --all
* ca2e160 (HEAD) [feat] add .gitignore
| *   20294b3 (refs/stash, test_main) WIP on test_main: 98c8e55 [merge] merge two stashes
| |\
| | * c5da711 index on test_main: 98c8e55 [merge] merge two stashes
| |/
| *   98c8e55 [merge] merge two stashes
| |\
| | *   6a1ee02 WIP on test_main: 6dcd099 [feat] modify mathlib
| | |\
| | | * 2d36d7a index on test_main: 6dcd099 [feat] modify mathlib
| | |/
| * |   9bce2af WIP on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |\ \
| | * | 542e4b2 index on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |/ /
| * / 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |/
| * 6dcd099 (origin/test_main) [feat] modify mathlib
| * ab1b885 [reset] from 17dc5cb to 0807098
| * 0807098 [fix] fix cmake, now you can build GT in build
| *   92fab8b (vice/test_main) [merge] merge with addgitignore
| |\
| |/
|/|
* | ed30eb4 (origin/addgitignore, addgitignore) [feat] add more ignore files
| *   9e15627 [fix] fix gcd bug: gcd(b, a - b) -> gcd(b, a % b)
| |\
| | * 106310e (origin/mathlib, mathlib) [feat] add math.cpp: add gcd
| * | fc64b4e [feat] add math.cpp
| * | 249ba41 [feat]: restore gitignore
| * |   6dded68 [feat]: add image to README.md
| |\ \
| |/ /
|/| |
* | | 97581f4 [feat] add gitignore
| |/
|/|
| * 2ae950b [feat] add .gitignore
|/
*   edbe3a3 Merge branch 'addreadme' into test_main add README.md by AKonjac0
|\
| * bfae278 (origin/addreadme, addreadme) [feat] modify README.md: add git log
| * 2ffc18a (vice/addreadme) [feat] modify README.md: add initialization, ssh, branch and remote
| * 127cab9 [feat] add README.md
* | f5663d1 [feat] add directories and modify CMakeLists.txt
* | c7cc3e4 add module b and CMake
|/
* 76de40c (origin/master, master) initial commit
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git add .
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git status
interactive rebase in progress; onto ed30eb4
Last commands done (2 commands done):
   pick 2ae950b [feat] add .gitignore
   pick 249ba41 [feat]: restore gitignore
Next commands to do (9 remaining commands):
   pick fc64b4e [feat] add math.cpp
   pick 106310e [feat] add math.cpp: add gcd
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'test_main' on 'ed30eb4'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git rebase --continue
Auto-merging src/math.cpp
CONFLICT (add/add): Merge conflict in src/math.cpp
error: could not apply 106310e... [feat] add math.cpp: add gcd
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 106310e... [feat] add math.cpp: add gcd
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git log --graph --oneline --all
* 271ec64 (HEAD) [feat] add math.cpp
* ca2e160 [feat] add .gitignore
| *   20294b3 (refs/stash, test_main) WIP on test_main: 98c8e55 [merge] merge two stashes
| |\
| | * c5da711 index on test_main: 98c8e55 [merge] merge two stashes
| |/
| *   98c8e55 [merge] merge two stashes
| |\
| | *   6a1ee02 WIP on test_main: 6dcd099 [feat] modify mathlib
| | |\
| | | * 2d36d7a index on test_main: 6dcd099 [feat] modify mathlib
| | |/
| * |   9bce2af WIP on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |\ \
| | * | 542e4b2 index on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |/ /
| * / 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |/
| * 6dcd099 (origin/test_main) [feat] modify mathlib
| * ab1b885 [reset] from 17dc5cb to 0807098
| * 0807098 [fix] fix cmake, now you can build GT in build
| *   92fab8b (vice/test_main) [merge] merge with addgitignore
| |\
| |/
|/|
* | ed30eb4 (origin/addgitignore, addgitignore) [feat] add more ignore files
| *   9e15627 [fix] fix gcd bug: gcd(b, a - b) -> gcd(b, a % b)
| |\
| | * 106310e (origin/mathlib, mathlib) [feat] add math.cpp: add gcd
| * | fc64b4e [feat] add math.cpp
| * | 249ba41 [feat]: restore gitignore
| * |   6dded68 [feat]: add image to README.md
| |\ \
| |/ /
|/| |
* | | 97581f4 [feat] add gitignore
| |/
|/|
| * 2ae950b [feat] add .gitignore
|/
*   edbe3a3 Merge branch 'addreadme' into test_main add README.md by AKonjac0
|\
| * bfae278 (origin/addreadme, addreadme) [feat] modify README.md: add git log
| * 2ffc18a (vice/addreadme) [feat] modify README.md: add initialization, ssh, branch and remote
| * 127cab9 [feat] add README.md
* | f5663d1 [feat] add directories and modify CMakeLists.txt
* | c7cc3e4 add module b and CMake
|/
* 76de40c (origin/master, master) initial commit
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git rebase --continue
src/math.cpp: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git add .
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git rebase --continue
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git add .
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git rebase --continue
[detached HEAD 68ab391] [feat] add math.cpp: add gcd
 1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
error: could not apply 0807098... [fix] fix cmake, now you can build GT in build
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 0807098... [fix] fix cmake, now you can build GT in build
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git add .
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git rebase --continue
[detached HEAD 8cc6fff] [fix] fix cmake, now you can build GT in build
 4 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 image-1.png
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
error: could not apply ab1b885... [reset] from 17dc5cb to 0807098
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply ab1b885... [reset] from 17dc5cb to 0807098
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git add .
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git rebase --continue
[detached HEAD fef79e1] [reset] from 17dc5cb to 0807098
 4 files changed, 18 insertions(+), 1 deletion(-)
 delete mode 100644 image-1.png
 create mode 100644 image-2.png
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
error: could not apply 2d36d7a... index on test_main: 6dcd099 [feat] modify mathlib
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2d36d7a... index on test_main: 6dcd099 [feat] modify mathlib
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git log --graph --oneline --all
* c4bf1c7 (HEAD) index on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
* 7c68b02 Revert "[reset] from 17dc5cb to 0807098"
* fe1063e [feat] modify mathlib
* fef79e1 [reset] from 17dc5cb to 0807098
* 8cc6fff [fix] fix cmake, now you can build GT in build
* 68ab391 [feat] add math.cpp: add gcd
* 271ec64 [feat] add math.cpp
* ca2e160 [feat] add .gitignore
| *   20294b3 (refs/stash, test_main) WIP on test_main: 98c8e55 [merge] merge two stashes
| |\
| | * c5da711 index on test_main: 98c8e55 [merge] merge two stashes
| |/
| *   98c8e55 [merge] merge two stashes
| |\
| | *   6a1ee02 WIP on test_main: 6dcd099 [feat] modify mathlib
| | |\
| | | * 2d36d7a index on test_main: 6dcd099 [feat] modify mathlib
| | |/
| * |   9bce2af WIP on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |\ \
| | * | 542e4b2 index on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |/ /
| * / 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |/
| * 6dcd099 (origin/test_main) [feat] modify mathlib
| * ab1b885 [reset] from 17dc5cb to 0807098
| * 0807098 [fix] fix cmake, now you can build GT in build
| *   92fab8b (vice/test_main) [merge] merge with addgitignore
| |\
| |/
|/|
* | ed30eb4 (origin/addgitignore, addgitignore) [feat] add more ignore files
| *   9e15627 [fix] fix gcd bug: gcd(b, a - b) -> gcd(b, a % b)
| |\
| | * 106310e (origin/mathlib, mathlib) [feat] add math.cpp: add gcd
| * | fc64b4e [feat] add math.cpp
| * | 249ba41 [feat]: restore gitignore
| * |   6dded68 [feat]: add image to README.md
| |\ \
| |/ /
|/| |
* | | 97581f4 [feat] add gitignore
| |/
|/|
| * 2ae950b [feat] add .gitignore
|/
*   edbe3a3 Merge branch 'addreadme' into test_main add README.md by AKonjac0
|\
| * bfae278 (origin/addreadme, addreadme) [feat] modify README.md: add git log
| * 2ffc18a (vice/addreadme) [feat] modify README.md: add initialization, ssh, branch and remote
| * 127cab9 [feat] add README.md
* | f5663d1 [feat] add directories and modify CMakeLists.txt
* | c7cc3e4 add module b and CMake
|/
* 76de40c (origin/master, master) initial commit
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git add .
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git log --graph --oneline --all
* c4bf1c7 (HEAD) index on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
* 7c68b02 Revert "[reset] from 17dc5cb to 0807098"
* fe1063e [feat] modify mathlib
* fef79e1 [reset] from 17dc5cb to 0807098
* 8cc6fff [fix] fix cmake, now you can build GT in build
* 68ab391 [feat] add math.cpp: add gcd
* 271ec64 [feat] add math.cpp
* ca2e160 [feat] add .gitignore
| *   20294b3 (refs/stash, test_main) WIP on test_main: 98c8e55 [merge] merge two stashes
| |\
| | * c5da711 index on test_main: 98c8e55 [merge] merge two stashes
| |/
| *   98c8e55 [merge] merge two stashes
| |\
| | *   6a1ee02 WIP on test_main: 6dcd099 [feat] modify mathlib
| | |\
| | | * 2d36d7a index on test_main: 6dcd099 [feat] modify mathlib
| | |/
| * |   9bce2af WIP on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |\ \
| | * | 542e4b2 index on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |/ /
| * / 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |/
| * 6dcd099 (origin/test_main) [feat] modify mathlib
| * ab1b885 [reset] from 17dc5cb to 0807098
| * 0807098 [fix] fix cmake, now you can build GT in build
| *   92fab8b (vice/test_main) [merge] merge with addgitignore
| |\
| |/
|/|
* | ed30eb4 (origin/addgitignore, addgitignore) [feat] add more ignore files
| *   9e15627 [fix] fix gcd bug: gcd(b, a - b) -> gcd(b, a % b)
| |\
| | * 106310e (origin/mathlib, mathlib) [feat] add math.cpp: add gcd
| * | fc64b4e [feat] add math.cpp
| * | 249ba41 [feat]: restore gitignore
| * |   6dded68 [feat]: add image to README.md
| |\ \
| |/ /
|/| |
* | | 97581f4 [feat] add gitignore
| |/
|/|
| * 2ae950b [feat] add .gitignore
|/
*   edbe3a3 Merge branch 'addreadme' into test_main add README.md by AKonjac0
|\
| * bfae278 (origin/addreadme, addreadme) [feat] modify README.md: add git log
| * 2ffc18a (vice/addreadme) [feat] modify README.md: add initialization, ssh, branch and remote
| * 127cab9 [feat] add README.md
* | f5663d1 [feat] add directories and modify CMakeLists.txt
* | c7cc3e4 add module b and CMake
|/
* 76de40c (origin/master, master) initial commit
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git rebase --continue
[detached HEAD 8b06444] index on test_main: 6dcd099 [feat] modify mathlib
 1 file changed, 14 insertions(+), 1 deletion(-)
Successfully rebased and updated refs/heads/test_main.
yyr0419@AKonjac:/mnt/d/mkdocs/note/docs/misc/git$ git log --graph --oneline --all
* 5c5e32b (HEAD -> test_main) index on test_main: 98c8e55 [merge] merge two stashes
* 8b06444 index on test_main: 6dcd099 [feat] modify mathlib
* c4bf1c7 index on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
* 7c68b02 Revert "[reset] from 17dc5cb to 0807098"
* fe1063e [feat] modify mathlib
* fef79e1 [reset] from 17dc5cb to 0807098
* 8cc6fff [fix] fix cmake, now you can build GT in build
* 68ab391 [feat] add math.cpp: add gcd
* 271ec64 [feat] add math.cpp
* ca2e160 [feat] add .gitignore
| *   20294b3 (refs/stash) WIP on test_main: 98c8e55 [merge] merge two stashes
| |\
| | * c5da711 index on test_main: 98c8e55 [merge] merge two stashes
| |/
| *   98c8e55 [merge] merge two stashes
| |\
| | *   6a1ee02 WIP on test_main: 6dcd099 [feat] modify mathlib
| | |\
| | | * 2d36d7a index on test_main: 6dcd099 [feat] modify mathlib
| | |/
| * |   9bce2af WIP on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |\ \
| | * | 542e4b2 index on test_main: 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |/ /
| * / 82d209a Revert "[reset] from 17dc5cb to 0807098"
| |/
| * 6dcd099 (origin/test_main) [feat] modify mathlib
| * ab1b885 [reset] from 17dc5cb to 0807098
| * 0807098 [fix] fix cmake, now you can build GT in build
| *   92fab8b (vice/test_main) [merge] merge with addgitignore
| |\
| |/
|/|
* | ed30eb4 (origin/addgitignore, addgitignore) [feat] add more ignore files
| *   9e15627 [fix] fix gcd bug: gcd(b, a - b) -> gcd(b, a % b)
| |\
| | * 106310e (origin/mathlib, mathlib) [feat] add math.cpp: add gcd
| * | fc64b4e [feat] add math.cpp
| * | 249ba41 [feat]: restore gitignore
| * |   6dded68 [feat]: add image to README.md
| |\ \
| |/ /
|/| |
* | | 97581f4 [feat] add gitignore
| |/
|/|
| * 2ae950b [feat] add .gitignore
|/
*   edbe3a3 Merge branch 'addreadme' into test_main add README.md by AKonjac0
|\
| * bfae278 (origin/addreadme, addreadme) [feat] modify README.md: add git log
| * 2ffc18a (vice/addreadme) [feat] modify README.md: add initialization, ssh, branch and remote
| * 127cab9 [feat] add README.md
* | f5663d1 [feat] add directories and modify CMakeLists.txt
* | c7cc3e4 add module b and CMake
|/
* 76de40c (origin/master, master) initial commit