十年磨一剑

first to the submodule you want to add, git init, add remote and push go back to the parent folder, git submodule add ./your_submodule

在项目开发中, 有些配置文件中的配置是因为机器会不一样的, 比较配置文件中的IP地址或数据库地址, 这时我们希望每个项目保持这些配置而不相互覆盖. 这里我们希望在*.ini文件中所有以//#gitignore结尾的行保持不变 首先我们在项目中建立一个.gitattributes文件, 里面写上*.ini filter=lineignore 这句的意思在所有*.ini加上一个过滤器, 过滤器的名字叫lineignore 然后我们建立一个.gitconfig文件, 里面写上 git config --globa

https://stackoverflow.com/questions/1759587/how-to-un-submodule-a-git-submodule git rm --cached submodule_path # delete reference to submodule HEAD (no trailing slash) git rm .gitmodules # if you have more than one submodules,

Rename the local branch to the new name git branch -m <old_name> <new_name> Delete the old branch on remote - where is, for example, origin git push --delete <old_name> Or shorter way to delete remote branch [:] git push :<old_name&

相信对于很多使用git的用户来说, rebase 和 merge像两个恶梦一样, 到底应该是从哪个branch rebase/merge 到哪个branch? rebase和merge有什么区别? 我先回答一下第一问题: 如果你想把feature branch rebase/merge到master branch. 你得从feature branch rebase onto / merge i...

https://superuser.com/questions/163033/pull-for-another-git-branch-without-switching https://stackoverflow.com/questions/31368434/how-can-i-print-the-log-for-a-branch-other-than-the-current-one say, w...

say i have two branches: condor and master Then I do some changes on master where I edited on my laptop, then apply these changes to the condor branch to get it run on condor. so, first, you checkout ...

https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging $ git checkout -b iss53 Switched to a new branch "iss53" This is shorthand for: $ git branch iss53 $ git checkout iss53

引用自https://docs.gitlab.com/ee/topics/git/numerous_undo_possibilities_in_git/ At this point there are 3 options to undo the local changes you have: Discard all local changes, but save them for possible...

https://stackoverflow.com/questions/5483213/fatal-git-write-tree-error-building-trees solution: git reset --mixed

转自:https://stackoverflow.com/questions/10414769/git-pull-keeping-local-changes There is a simple solution based on Git stash. Stash everything that you’ve changed, pull all the new stuff, apply your s...

https://stackoverflow.com/questions/11451535/gitignore-is-ignored-by-git git rm -r --cached . git add .

git配置 [plain] view plain copy   git config --global user.name my_name   git config --global user.email my_email   git config --global credential.helper store   远程

假设在你的project A里面需要用到另外一个project B(official remote)作为你的submodule, 并且你想定制你自己的B， 则你先从official remote 下载到本地， 然后做些更改， 再上传到你的remote, B(ur remote). 然后在project A 里面， 加入submodule的时候url写B(ur remote). ...

https://stackoverflow.com/questions/48734119/git-lfs-is-not-a-git-command-unclear Ubuntu $ curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash sudo apt-get in...

解决ahead / behind 先reset到ahead,然后退回到分叉，再checkout 远端的behind 如果要删除本地的commit， 先到本地的最前端， 然后再用下面的命令 If you want to fix up your latest commit, you can undo the commit, and unstage the files in it,...

$ git clone https://github.com/libgit2/libgit2

clicking clone in github desktop always leads to https://desktop.github.com/ rather than launch the program. that's because you didn't sige in.

1 Installing Git for Linux Download and install Git for Linux : sudo apt-get install git   2 Configuring GitHub Once the installation has successfully completed, the next thing to do is