Posts with tag git

Copy all upstream branches after forking only main branchIf you've forked a Git repository but only have the main (or master) branch locally, you can fetch and track other remote branches from the original repository (upstream) into your fork. Here's how:Step 1: Add the Original Repository as upstreamIf you haven't already, add the original repo as a remote named upstream:git remote add upstream https://github.com/original-owner/original-repo.gitVerify remotes:git remote -v # Should show: # origin https://github.com/your-username/forked-repo.git (fetch/push) # upstream https://github.com/original-owner/original-repo.git (fetch)Step 2: Fetch All Branches from UpstreamFetch all branches and their commits from the original repository:git fetch upstreamThis downloads all branches (e.g., feature, dev, etc.) but doesn’t create local copies yet.Step 3: List Available Remote BranchesCheck which branches exist upstream:git branch -r # Shows remote branches (upstream/*)Example output:upstream/main upstream/feature-x upstream/devStep 4: Create Local Branches Tracking UpstreamFor each branch you want to copy (e.g., feature-x), create a local branch that tracks the upstream version:git checkout -b feature-x upstream/feature-xThis:Creates a local branch feature-x.Sets it to track upstream/feature-x.Switches you to the new branch.Repeat for other branches you need.Step 5: Push Branches to Your Fork (Optional)To make these branches available in your fork (on GitHub/GitLab), push them to origin:git push origin feature-xNow they’ll appear in your fork’s remote repository.Alternative: One-Liner to Copy All BranchesTo copy all upstream branches to local and push them to your fork:git fetch upstream for branch in $(git branch -r | grep -vE "HEAD|main"); do git checkout -b ${branch#upstream/} $branch git push origin ${branch#upstream/} doneThis script:Fetches all upstream branches.Loops through each (excluding HEAD and main).Creates local branches and pushes them to your fork.Key NotesTracking Branches: Local branches will track upstream (original repo). To track your fork instead:git branch -u origin/feature-x feature-xAvoid Conflicts: If branches already exist locally, use git checkout -B to reset them.Permissions: Ensure you have push access to your fork (origin).Let me know if you need help with a specific branch or error

从历史中删除大文件

2024-10-05

从历史中删除大文件see: https://blog.csdn.net/dss875914213/article/details/131500224其中找到大文件的命令我本地也未尝试verified on 24.10.5, o

git status 显示中文乱码

2024-08-19

git status 显示中文乱码git config --global core.quotepath false git config --global gui.encoding utf-8 git config --global i18n.commit.encoding utf-8 git config --global i18n.logoutputencoding utf-8 再执行 git status 发现能正常显示中文了。verified in env abov

Update all submodules to latest commit

2024-07-28

Update all submodules to latest commitdate: 2024-07-28os: Darwin floriandeMacBook-Air.local 23.5.0 Darwin Kernel Version 23.5.0: Wed May 1 20:16:51 PDT 2024; root:xnu-10063.121.3~5/RELEASE_ARM64_T8103 arm64author: Julyfun MacOS14.5 M1suppose-you-know: nothingref: https://stackoverflow.com/questions/5828324/update-git-submodule-to-latest-commit-on-origingit submodule foreach git pul

First time shallow clone (Or you can mofify .gitmodules manually instead of this command)

2024-07-28

commitgitresetsoftwares-and-tools

ref: https://stackoverflow.com/questions/2144406/how-to-make-shallow-git-submodules# First time shallow clone (Or you can mofify .gitmodules manually instead of this command) git submodule add --depth 1 [email protected]:lorem/ipsum.git path/to/submodule # set permanently to shallow clone (like for deploying) git config -f .gitmodules submodule.path/to/submodule.shallow tru

revert-last-commit

2024-07-25

ref: https://blog.csdn.net/w958796636/article/details/53611133git reset HEAD^HEAD^的意思是上一个版本，也可以写成HEAD~1如果你进行了2次commit，想都撤回，可以使用HEAD~2--mixed 意思是：不删除工作空间改动代码，撤销commit，并且撤销git add . 操作这个为默认参数,git reset --mixed HEAD^ 和 git reset HEAD^ 效果是一样的。 --soft 不删除工作空间改动代码，撤销commit，不撤销git add . --hard 删除工作空间改动代码，撤销commit，撤销git add . 注意完成这个操作后，就恢复到了上一次的commit状态undo 第一个 init commitref: https://stackoverflow.com/questions/6632191/how-to-revert-initial-git-commitgit update-ref -d HEA

revert-last-commit

2024-07-25

commitgitresetsoftwares-and-tools

Add exisiting local git repo as submodule as a submodule to parent directory repo?

2024-07-10

conflictgitsoftwares-and-tools

Add exisiting local git repo as submodule as a submodule to parent directory repo?git submodule add ./Segmentation1 Segmentation1 # this is optional, I do not recommend # git submodule absorbgitdirs Segmentation1 # add submodule's url git config -f .gitmodules submodule.Segmentation1.url \ https://github.com/etc/path.gitref: https://www.reddit.com/r/git/comments/edn49q/how_to_add_existing_local_git_repo_as_a_submodule/Verified on 24/7/10

choose Conflicts in rebase

2024-06-02

choose Conflicts in rebaseimage.png|800情况：origin/main 上别人有新 push，本地 main 上自己有 commit，pull with rebase 时发生冲突打开 vscode 合并冲突界面，左边是 origin/main，右边是本地的新 commit测试完了，确实是这样

error: external filter 'git-lfs filter-process' failed

2024-05-21

gitlfssoftwares-and-tools

error: external filter 'git-lfs filter-process' failedref: https://blog.csdn.net/derteanoo/article/details/124432254use this first:git lfs install --skip-smudg

discard-changes-or-restore-a-file

2024-04-28

gitrestoresoftwares-and-tools

恢复被删除的文件：git restore <origin_file_name

Revert git add

2024-04-28

addgitsoftwares-and-tools

Revert git addref: https://segmentfault.com/q/1010000006864939git rese

Git log command search content

2024-04-23

gitlogsoftwares-and-tools

Git log command search contentby chatgpt 3.5:git log -S '#include <sys/_types/_off_t.h>' git log -S '#include <sys/_types/_off_t.h>' --onelin

clone-certain-branch

2024-04-22

clonegitsoftwares-and-tools

https://stackoverflow.com/questions/1911109/how-do-i-clone-a-specific-git-branchgit clone -b <branch> <remote_repo> git clone -b my-branch [email protected]:user/myproject.gi

clone-certain-version

2024-04-22

clonegitsoftwares-and-tools

git clone <link> -b <tag> --depth=

Git shallow clone local repo

2024-04-22

clonegitsoftwares-and-tools

Git shallow clone local reporef: https://stackoverflow.com/questions/40383230/git-clone-warning-depth-is-ignored-in-local-clones-use-file-insteadgit clone --depth 1 file://$(pwd)/src_repo new_rep

Fix when remote default branch is renamed

2024-04-21

gitsoftwares-and-toolstag

Fix when remote default branch is renamedref: github tipgit branch -m <old> <new> git fetch origin git branch -u origin/<new> <new> git remote set-head origin -

rename-tag

2024-04-20

ref: https://stackoverflow.com/questions/1028649/how-do-you-rename-a-git-taggit tag new old # Create a new local tag named `new` from tag `old`. git tag -d old # Delete local tag `old`. git push origin new :old # Push `new` to your remote named "origin", and delete # tag `old` on origin (by pushing an empty tag # name to it).for co-workersgit fetch --prune --prune-tag

Create new branch in remote

2024-04-19

gitremotesoftwares-and-tools

Create new branch in remotegit push -u <remote_name> <new_branch_name> # example git push -u origin stage

Delete a remote branch

2024-04-14

gitsoftwares-and-toolsworkflow

Delete a remote branchgit push <remote_name> --delete <remote_branch_name> Example: git push origin --delete feat/anchor-visualiz

Workflow by Gao Tian

2024-04-14

Workflow by Gao Tianref: https://www.bilibili.com/video/BV19e4y1q7JJ@zrx_p4ul on bilibili.com1.git clone // 到本地 2.git checkout -b xxx 切换至新分支xxx （相当于复制了remote的仓库到本地的xxx分支上 3.修改或者添加本地代码（部署在硬盘的源文件上） 4.git diff 查看自己对代码做出的改变 5.git add 上传更新后的代码至暂存区 6.git commit 可以将暂存区里更新后的代码更新到本地git 7.git push origin xxx 将本地的xxxgit分支上传至github上的git ----------------------------------------------------------- （如果在写自己的代码过程中发现远端GitHub上代码出现改变） 1.git checkout main 切换回main分支 2.git pull origin master(main) 将远端修改过的代码再更新到本地 3.git checkout xxx 回到xxx分支 4.git rebase main 我在xxx分支上，先把main移过来，然后根据我的commit来修改成新的内容（中途可能会出现，rebase conflict -----》手动选择保留哪段代码） 5.git push -f origin xxx 把rebase后并且更新过的代码再push到远端github上（-f ---》强行） 6.原项目主人采用pull request 中的 squash and merge 合并所有不同的commit ---------------------------------------------------------------------------------------------- 远端完成更新后 1.git branch -d xxx 删除本地的git分支 2.git pull origin master 再把远端的最新代码拉至本

clone-or-update-submodule

2024-04-07

gitrestoresoftwares-and-tools

https://stackoverflow.com/questions/3796927/how-do-i-git-clone-a-repo-including-its-submodulesClone with submodulesgit clone --recurse-submodules -j8 git://github.com/foo/bar.gitAlready cloned, get submodulesgit submodule update --init --recursiv

restore-cur-dir

2024-04-03

ref: https://stackoverflow.com/questions/15404535/how-to-git-reset-hard-a-subdirectorygit restore --source=HEAD --staged --worktree -- . git restore -s@ -SW -- <path

how-to-compare-a-local-git-branch-with-its-remote-branch

2024-04-02

diffgitsoftwares-and-tools

ref: https://stackoverflow.com/questions/1800783/how-to-compare-a-local-git-branch-with-its-remote-branchgit diff <local branch> <remote>/<remote branch> git diff main origin/mai

diff-staged-or-unstaged

2024-03-30

diffgitsoftwares-and-tools

ref: https://stackoverflow.com/questions/1587846/how-do-i-show-the-changes-which-have-been-stagedgit diff # show unstaged but tracked git diff --cached # show staged git diff HEAD # show staged and unstaged (till last commit) git diff --name-only --cached # show file names onl

tag

2024-03-29

gitsoftwares-and-toolstag

git tag <tagname> get push origin --tags git tag -d <tagname> # delete git push --delete origin <tagname> # delete remote tags git show <tagname> # detai

create-a-tag-in-a-github-repository

gitsoftwares-and-toolstag

ref: https://stackoverflow.com/questions/18216991/create-a-tag-in-a-github-repositoryYou can create tags for GitHub by either using:the Git command line, orGitHub's web interface.Creating tags from the command lineTo create a tag on your current branch, run this:git tag <tagname>If you want to include a description with your tag, add -a to create an annotated tag:git tag <tagname> -aThis will create a local tag with the current state of the branch you are on. When pushing to your remote repo, tags are NOT included by default. You will need to explicitly say that you want to push your tags to your remote repo:git push origin --tagsFrom the official Linux Kernel Git documentation for git push:--tagsAll refs under refs/tags are pushed, in addition to refspecs explicitly listed on the command line.Or if you just want to push a single tag:git push origin <tag>See also my answer to https://stackoverflow.com/questions/5195859/push-a-tag-to-a-remote-repository-using-git/23217431#23217431 for more details about that syntax above.Creating tags through GitHub's web interfaceYou can find GitHub's instructions for this at their Creating Releases help page. Here is a summary:Click the releases link on our repository page,Screenshot 1Click on Create a new release or Draft a new release,Screenshot 2Fill out the form fields, then click Publish release at the bottom,Screenshot 3 Screenshot 4After you create your tag on GitHub, you might want to fetch it into your local repository too: git fetchNow next time, you may want to create one more tag within the same release from website. For that follow these steps:Go to release tabClick on edit button for the releaseProvide name of the new tag ABC_DEF_V_5_3_T_2 and hit tabAfter hitting tab, UI will show this message: Excellent! This tag will be created from the target when you publish this release. Also UI will provide an option to select the branch/commitSelect branch or commitCheck "This is a pre-release" checkbox for qa tag and uncheck it if the tag is created for Prod tag.After that click on "Update Release"This will create a new Tag within the existing Release

get-current-branch-name

https://stackoverflow.com/questions/6245570/how-do-i-get-the-current-branch-name-in-gitgit rev-parse --abbrev-ref HEA

git-branch

git branchMain Git command for working with branches. More information: https://git-scm.com/docs/git-branch.List all branches (local and remote; the current branch is highlighted by *): git branch --allList which branches include a specific Git commit in their history: git branch --all --contains commit_hashShow the name of the current branch: git branch --show-currentCreate new branch based on the current commit: git branch branch_nameCreate new branch based on a specific commit: git branch branch_name commit_hashRename a branch (must not have it checked out to do this): git branch -m old_branch_name new_branch_nameDelete a local branch (must not have it checked out to do this): git branch -d branch_nameDelete a remote branch: git push remote_name --delete remote_branch_nam

show-config

configgitsoftwares-and-tools

According to:https://stackoverflow.com/questions/12254076/how-do-i-show-my-global-git-configurationgit config --listor:git config --list --show-origi

where-is-git-config-file

configgitsoftwares-and-tools

ref: https://www.theserverside.com/blog/Coffee-Talk-Java-News-Stories-and-Opinions/Where-system-global-and-local-Windows-Git-config-files-are-savedUbuntu: ~/.gitconfi

diff-vs-status

diffgitsoftwares-and-tools

https://www.cloudbees.com/blog/git-status-in-depthWhile git status only tells you the state of your file changes, git diff tells you the exact changes

convert-a-existing-non-empty-directory-to-git

gitinitsoftwares-and-tools

According to:https://stackoverflow.com/questions/3311774/how-to-convert-existing-non-empty-directory-into-a-git-working-directory-and-pus非空文件夹是可以 git init 的。you need:cd <localdir> git init git add . git commit -m 'message' git remote add origin <url> git push -u origin mai

git-log-oneline-date-author

gitlogsoftwares-and-tools

git log --pretty="%C(Yellow)%h %C(reset)%ad (%C(Green)%cr%C(reset))%x09 %C(Cyan)%an: %C(reset)%s" --date=short -7ref: https://stackoverflow.com/questions/1057564/pretty-git-branch-graphsgit 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(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)

git-log-show-commit-details

gitlogsoftwares-and-tools

git log -p path/to/file_or_directory git log -p git log -p -3 # show recent 3 git commits' detai

git-pull-local-and-remote-conflict

gitpullsoftwares-and-tools

Commits likelocal: xxx -> some commit remote: xxx -> yyy -> zzzNow, git pull locally is not valid.What to do?Well you should git rebase, it rebases automaticall

need-to-specify-how-to-reconcile-divergent-branches-when-git-pull

gitpullsoftwares-and-tools

Error message ! [rejected] main -> main (non-fast-forward) error: failed to push some refs to 'github.com:julyfun/mfa.fish.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.orhint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation.First CheckCheck if you have tried git pull.Sol 1Use github desktop, just pull and no problem occurs.Sol 2git config pull.rebase falseThat's what github desktop does

show-stages

gitsoftwares-and-toolsstage

没有检出一个提交

2024-03-27

commitgitsoftwares-and-tools

错误：'web-snapshots/' 没有检出一个提交致命错误：添加文件失败Sol仓库内有一个错误的子仓库，删除它

another-git-process-seems-to-be-running-in-this-repository

2024-03-07

Problemfatal: Unable to create '/home/julyfun/Documents/GitHub/julyfun/PlasticBag/.git/index.lock': File exists. Another git process seems to be running in this repository, e.g. an editor opened by 'git commit'. Please make sure all processes are terminated then try again. If it still fails, a git process may have crashed in this repository earlier: remove the file manually to continue.SolRemove that file

you-have-not-concluded-your-merge-merge-head-exists

2024-02-28

ref: https://stackoverflow.com/questions/11646107/you-have-not-concluded-your-merge-merge-head-existsThe problem is your previous pull failed to merge automatically and went to conflict state. And the conflict wasn't resolved properly before the next pull.Undo the merge and pull again.To undo a merge:git merge --abort [Since git version 1.7.4]git reset --merge [prior git versions]Resolve the conflict.Don't forget to add and commit the merge.git pull now should work fine

delete-all-previously-tracked-but-should-be-ignored-files

2024-01-22

https://stackoverflow.com/questions/1274057/how-do-i-make-git-forget-about-a-file-that-was-tracked-but-is-now-in-gitignore?page=1&tab=scoredesc#tab-topno better way but:git rm -r --cached . git add

aliyun-git-commit-message

https://developer.aliyun.com/article/770277commit message格式<type>(<scope>): <subject>type(必须)用于说明git commit的类别，只允许使用下面的标识。feat：新功能（feature）。fix/to：修复bug，可以是QA发现的BUG，也可以是研发自己发现的BUG。fix：产生diff并自动修复此问题。适合于一次提交直接修复问题 to：只产生diff不自动修复此问题。适合于多次提交。最终修复问题提交时使用fix docs：文档（documentation）。style：格式（不影响代码运行的变动）。refactor：重构（即不是新增功能，也不是修改bug的代码变动）。perf：优化相关，比如提升性能、体验。test：增加测试。chore：构建过程或辅助工具的变动。revert：回滚到上一个版本。merge：代码合并。sync：同步主线或分支的Bug。scope(可选)scope用于说明 commit 影响的范围，比如数据层、控制层、视图层等等，视项目不同而不同。例如在Angular，可以是location，browser，compile，compile，rootScope， ngHref，ngClick，ngView等。如果你的修改影响了不止一个scope，你可以使用*代替。subject(必须)subject是commit目的的简短描述，不超过50个字符。建议使用中文（感觉中国人用中文描述问题能更清楚一些）。结尾不加句号或其他标点符号。根据以上规范git commit message将是如下的格式：fix(DAO):用户查询缺少username属性feat(Controller):用户查询接口开发以上就是我们梳理的git commit规范，那么我们这样规范git commit到底有哪些好处呢？便于程序员对提交历史进行追溯，了解发生了什么情况。一旦约束了commit message，意味着我们将慎重的进行每一次提交，不能再一股脑的把各种各样的改动都放在一个git commit里面，这样一来整个代码改动的历史也将更加清晰。格式化的commit message才可以用于自动化输出Change log

change-default-branch-for-everything-i-do

According to:https://stackoverflow.com/questions/67543278/git-how-to-change-default-branch-for-everything-i-dogit config --global init.defaultBranch mai

git-export

just git clone the directory

git.old

第一次上传git push -u origin main-u: This option, short for --set-upstream, tells Git to set up a tracking branch. It associates the remote branch with the local branch you are pushing. By using this option, you can use the simpler command git push in the future without specifying the remote and branch names every time.set default editorgit config --global core.editor "nvim"git 和远端分支比较git diff main origin/main删除远端分支在网页端删除比较好。git push origin --delete repo git push origin :repoRename a repo在网页端 settings.然后git remote set-url origin [email protected]:someuser/newprojectname.git小体积拷贝git clone --filter=blob:none git clone --filter=tree:0 git clone --depth=

show-git-sha