diff --git a/222.text b/222.text index 5b65c8eaa7a8a2d9cc77425d9f6ba4c9201eedc6..a23169c48f9410f91ecf9a6b5fa1b94d609cb200 100644 --- a/222.text +++ b/222.text @@ -1 +1 @@ -wqeqwe \ No newline at end of file +wqeqwedasdsadsdfsaf \ No newline at end of file diff --git a/3.text b/3.text new file mode 100644 index 0000000000000000000000000000000000000000..1df5a02789378390a73688b6b2c9efca6255cd3d --- /dev/null +++ b/3.text @@ -0,0 +1 @@ +24344213123 \ No newline at end of file diff --git a/dev_sit.text b/dev_sit.text new file mode 100644 index 0000000000000000000000000000000000000000..0a65d03a424b2a910a3cc4678142cd1938ac0cbe --- /dev/null +++ b/dev_sit.text @@ -0,0 +1,464 @@ +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git status +On branch master +Your branch is up to date with 'origin/master'. + +Changes to be committed: + (use "git restore --staged ..." to unstage) + new file: git.md + + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git commit -"222" +error: unknown switch `2' +usage: git commit [] [--] ... + + -q, --quiet suppress summary after successful commit + -v, --verbose show diff in commit message template + +Commit message options + -F, --file read message from file + --author override author for commit + --date override date for commit + -m, --message + commit message + -c, --reedit-message + reuse and edit message from specified commit + -C, --reuse-message + reuse message from specified commit + --fixup use autosquash formatted message to fixup specified commit + --squash 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 + use specified template file + -e, --edit force edit of commit + --cleanup how to strip spaces and #comments from message + --status include status in commit message template + -S, --gpg-sign[=] + 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 + --ahead-behind compute full ahead/behind values + --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[=] + show untracked files, optional modes: all, normal, no. (Default: all) + --pathspec-from-file + read pathspec from file + --pathspec-file-nul with --pathspec-from-file, pathspec elements are separated with NUL character + + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git commit -m "222" + +*** Please tell me who you are. + +Run + + git config --global user.email "you@example.com" + git config --global user.name "Your Name" + +to set your account's default identity. +Omit --global to set the identity only in this repository. + +fatal: unable to auto-detect email address (got 'admin@DESKTOP-TQBHMPE.(none)') + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git pull +Already up to date. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git config --global user.email "you@example.com" + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git config --global user.email "977315036@qq.com" + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git config --global user.name "KimTylor" + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git commit -m "222" +[master 4966a9b] 222 + 1 file changed, 2 insertions(+) + create mode 100644 git.md + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git push +Enumerating objects: 4, done. +Counting objects: 100% (4/4), done. +Delta compression using up to 12 threads +Compressing objects: 100% (2/2), done. +Writing objects: 100% (3/3), 326 bytes | 326.00 KiB/s, done. +Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 +remote: Powered by GITEE.COM [GNK-5.0] +To https://gitee.com/KimTylor/vue_demo_git.git + 0e517e3..4966a9b master -> master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git checkout dev +Switched to branch 'dev' +Your branch is up to date with 'origin/dev'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git push +Everything up-to-date + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git pull +Already up to date. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git checkout -b dev_0107 origin/dev +Switched to a new branch 'dev_0107' +Branch 'dev_0107' set up to track remote branch 'dev' from 'origin'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git checkout dev +Switched to branch 'dev' +Your branch is up to date with 'origin/dev'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git pull +Already up to date. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git branch +* dev + dev_0107 + master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git checkout master +Switched to branch 'master' +Your branch is up to date with 'origin/master'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git pull +Already up to date. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git checkout dev +Switched to branch 'dev' +Your branch is up to date with 'origin/dev'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git checkout dev_0107 +Switched to branch 'dev_0107' +Your branch is up to date with 'origin/dev'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git checkout dev +Switched to branch 'dev' +Your branch is up to date with 'origin/dev'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git merge dev_0107 +Already up to date. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git push +Everything up-to-date + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git add . + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git commit -m "222" +[dev ce3e6f6] 222 + 1 file changed, 1 insertion(+) + create mode 100644 1.text + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git push +Enumerating objects: 4, done. +Counting objects: 100% (4/4), done. +Delta compression using up to 12 threads +Compressing objects: 100% (2/2), done. +Writing objects: 100% (3/3), 295 bytes | 295.00 KiB/s, done. +Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 +remote: Powered by GITEE.COM [GNK-5.0] +To https://gitee.com/KimTylor/vue_demo_git.git + 0e517e3..ce3e6f6 dev -> dev + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git branch +* dev + dev_0107 + master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git branch -v +* dev ce3e6f6 222 + dev_0107 0e517e3 [behind 1] Initial commit + master 4966a9b 222 + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git branch -a +* dev + dev_0107 + master + remotes/origin/HEAD -> origin/master + remotes/origin/dev + remotes/origin/master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git checkout master +Switched to branch 'master' +Your branch is up to date with 'origin/master'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git branch -a + dev + dev_0107 +* master + remotes/origin/HEAD -> origin/master + remotes/origin/dev + remotes/origin/master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git branch -av + dev ce3e6f6 222 + dev_0107 0e517e3 [behind 1] Initial commit +* master 4966a9b 222 + remotes/origin/HEAD -> origin/master + remotes/origin/dev ce3e6f6 222 + remotes/origin/master 4966a9b 222 + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git remote -v +origin https://gitee.com/KimTylor/vue_demo_git.git (fetch) +origin https://gitee.com/KimTylor/vue_demo_git.git (push) + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (master) +$ git checkout dev_0107 +Switched to branch 'dev_0107' +Your branch is behind 'origin/dev' by 1 commit, and can be fast-forwarded. + (use "git pull" to update your local branch) + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git remote -v +origin https://gitee.com/KimTylor/vue_demo_git.git (fetch) +origin https://gitee.com/KimTylor/vue_demo_git.git (push) + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git remote -r +error: unknown switch `r' +usage: git remote [-v | --verbose] + or: git remote add [-t ] [-m ] [-f] [--tags | --no-tags] [--mirror=] + or: git remote rename + or: git remote remove + or: git remote set-head (-a | --auto | -d | --delete | ) + or: git remote [-v | --verbose] show [-n] + or: git remote prune [-n | --dry-run] + or: git remote [-v | --verbose] update [-p | --prune] [( | )...] + or: git remote set-branches [--add] ... + or: git remote get-url [--push] [--all] + or: git remote set-url [--push] [] + or: git remote set-url --add + or: git remote set-url --delete + + -v, --verbose be verbose; must be placed before a subcommand + + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git branch -r + origin/HEAD -> origin/master + origin/dev + origin/master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git pull +From https://gitee.com/KimTylor/vue_demo_git + * [new branch] dev_sit -> origin/dev_sit +Updating 0e517e3..ce3e6f6 +Fast-forward + 1.text | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 1.text + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git add . + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git commit -m "222" +On branch dev_0107 +Your branch is up to date with 'origin/dev'. + +nothing to commit, working tree clean + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git push dev_0107:dev +ssh: Could not resolve hostname dev_0107: Name or service not known +fatal: Could not read from remote repository. + +Please make sure you have the correct access rights +and the repository exists. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git branch + dev +* dev_0107 + master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_0107) +$ git checkout dev +Switched to branch 'dev' +Your branch is up to date with 'origin/dev'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git pull +Already up to date. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git add . + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git commit -m "444" +[dev 6650e4f] 444 + 1 file changed, 1 insertion(+) + create mode 100644 222.text + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git push +Enumerating objects: 4, done. +Counting objects: 100% (4/4), done. +Delta compression using up to 12 threads +Compressing objects: 100% (2/2), done. +Writing objects: 100% (3/3), 327 bytes | 327.00 KiB/s, done. +Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 +remote: Powered by GITEE.COM [GNK-5.0] +To https://gitee.com/KimTylor/vue_demo_git.git + ce3e6f6..6650e4f dev -> dev + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git branch +* dev + dev_0107 + master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git branch -r + origin/HEAD -> origin/master + origin/dev + origin/dev_sit + origin/master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git checkout origin/dev_sit +Note: switching to 'origin/dev_sit'. + +You are in 'detached HEAD' state. You can look around, make experimental +changes and commit them, and you can discard any commits you make in this +state without impacting any branches by switching back to a branch. + +If you want to create a new branch to retain commits you create, you may +do so (now or later) by using -c with the switch command. Example: + + git switch -c + +Or undo this operation with: + + git switch - + +Turn off this advice by setting config variable advice.detachedHead to false + +HEAD is now at ce3e6f6 222 + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git ((ce3e6f6...)) +$ git add . + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git ((ce3e6f6...)) +$ git commit -m "5555" +HEAD detached at origin/dev_sit +nothing to commit, working tree clean + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git ((ce3e6f6...)) +$ git push +fatal: You are not currently on a branch. +To push the history leading to the current (detached HEAD) +state now, use + + git push origin HEAD: + + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git ((ce3e6f6...)) +$ git pull +You are not currently on a branch. +Please specify which branch you want to merge with. +See git-pull(1) for details. + + git pull + + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git ((ce3e6f6...)) +$ git push origin HEAD: +bash: syntax error near unexpected token `newline' + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git ((ce3e6f6...)) +$ git checkout dev +Previous HEAD position was ce3e6f6 222 +Switched to branch 'dev' +Your branch is up to date with 'origin/dev'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git branch +* dev + dev_0107 + master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git branch -r + origin/HEAD -> origin/master + origin/dev + origin/dev_sit + origin/master + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev) +$ git checkout -b dev_sit origin/dev_sit +Switched to a new branch 'dev_sit' +Branch 'dev_sit' set up to track remote branch 'dev_sit' from 'origin'. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_sit) +$ git pull +Already up to date. + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_sit) +$ git add . + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_sit) +$ git commit -m "22121212" +[dev_sit 1322172] 22121212 + 2 files changed, 2 insertions(+) + create mode 100644 3.text + create mode 100644 dev_sit.text + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_sit) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 12 threads +Compressing objects: 100% (2/2), done. +Writing objects: 100% (4/4), 377 bytes | 377.00 KiB/s, done. +Total 4 (delta 0), reused 0 (delta 0), pack-reused 0 +remote: Powered by GITEE.COM [GNK-5.0] +To https://gitee.com/KimTylor/vue_demo_git.git + ce3e6f6..1322172 dev_sit -> dev_sit + +admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_sit) +$ \ No newline at end of file diff --git a/git.md b/git.md new file mode 100644 index 0000000000000000000000000000000000000000..b75bcf7ef8f83ffe8edf2a0430c8faac423dc099 --- /dev/null +++ b/git.md @@ -0,0 +1,2 @@ +### +git 本地合并远程分支 \ No newline at end of file diff --git "a/\346\217\220\344\272\244\344\277\256\346\224\271\346\226\207\344\273\266.text" "b/\346\217\220\344\272\244\344\277\256\346\224\271\346\226\207\344\273\266.text" index 490d06c9753a0d5e2913259e2744fa5f128bee0e..823b15a7444916818eb75efee1a73aaa1afae7e0 100644 --- "a/\346\217\220\344\272\244\344\277\256\346\224\271\346\226\207\344\273\266.text" +++ "b/\346\217\220\344\272\244\344\277\256\346\224\271\346\226\207\344\273\266.text" @@ -32,4 +32,4 @@ To https://gitee.com/KimTylor/vue_demo_git.git 1322172..0bdc46c dev_sit -> dev_sit admin@DESKTOP-TQBHMPE MINGW64 ~/Desktop/vue-vscode-git/vue_demo_git (dev_sit) -sdfsd \ No newline at end of file +sdfsd