C++博客--随笔分类-Git

git rebase 到更新的master

宋鹏 — Fri, 02 Apr 2021 06:33:00 GMT

1. Assume the following history exists and the current branch is "topic":

A---B---C topic

D---E---F---G master

From this point, the result of either of the following commands:

git rebase master

git rebase master topic

would be:

A'--B'--C' topic

D---E---F---G master

2. git rebase 过程中：
在修改完需要merge的文件后，用git add和git status来确认rebase状态，然后再git rebase --continue

宋鹏 2021-04-02 14:33 发表评论

git tag and git describe a specified path/commits/tags

宋鹏 — Wed, 13 Jan 2021 02:40:00 GMT

1. Create a tag with patterned name

git tag "tagname_v1.02"

(one tag is pointed to a specified commit)

2. get tag describe to use in software version name

git describe --tags --long --dirty=* --match "tagname*"

> tagname_v1.02-0-g59584af

3. push tag name to remote repo

git push origin --tags

宋鹏 2021-01-13 10:40 发表评论

Git第三阶段：show log/show head/show modified/modify comment

宋鹏 — Tue, 05 Mar 2019 01:09:00 GMT

查看日志（本地commit记录）：
git log
result:

commit f46a2277acf6b1604f3268fcd3652682f23347bc (HEAD -> master)

Author: songpeng

Date: Mon Mar 4 17:07:09 2019 +0800

查看日志中的某次提交：
git show f46a2277acf6b1604f3268fcd3652682f23347bc
查看各个日志都修改了哪些文件：

git log --name-only
查看各个日志文件的具体修改：
git log -p /path_you_specified

查看本地代码修改情况：
已修改，未add的变更：
git diff
已add，未commit的变更：
git diff --cached
上面两条合并：
git diff HEAD
两个commit之间的区别：

git diff 0da94be 59ff30c

变更日志内容（comment）:
首先显示最近3次提交的commit:
git rebase -i HEAD~3
运行后显示如下(我是在windows里面安装了vim,内容会显示在vim里，不知道没安装vim会如何显示)：

pick 41b65c0 recursive_search_and_link_libraries

pick 0de33bd success_built_with_vs2013lib_on_creator

pick 7ed1e94 success to built with vs2013lib and run on vs2013 ide

移动光标到想要修改commit的所在行，将pick改成reword，然后保存
然后刷新的界面内类似会出现你想修改的comment，将之修改保存。
然后运行：
git push --force，就会重新传到服务器，更新你要修改的comment.

宋鹏 2019-03-05 09:09 发表评论

Git第二阶段：add files/undo add/branch add/branch view/branch new/branch delete/branch push/pull remote to local files/fetch origin

宋鹏 — Mon, 04 Mar 2019 08:26:00 GMT

add:
git add *

undo add:
You can undo git add before commit with

git reset

which will remove it from the current index (the "about to be committed" list) without changing anything else.

You can use

git reset

add brach:
git branch rikSkinLoader

view branch:
git branch -a

switch branch:
git checkout BranchName

delete branch:
git branch -d

push branch:
git push origin branchname

pull:
git pull origin ：
git pull origin master:master

查看远端变更/后续操作：
git remote update

First use git remote update, to bring your remote refs up to date. Then you can do one of several things, such as:

git status -uno
git status -uno will tell you whether the branch you are tracking is ahead, behind or has diverged. If it says nothing, the local and remote are the same.

git show-branch *master

git show-branch *master will show you the commits in all of the branches whose names end in 'master' (eg master and origin/master).

宋鹏 2019-03-04 16:26 发表评论

Git第一阶段：入门操作(check in riles/checkout files)

宋鹏 — Sat, 02 Mar 2019 06:54:00 GMT

clone：
git clone https://github.com/songpeng22/HelloWorld.git

clone with username and password:
git clone https://username:password@github.com/username/repository.git.

clone old version:

git clone git://sourceware.org/git/glibc.git

cd glibc

git checkout glibc-2.28

clone with tagname：

git clone http://anongit.freedesktop.org/git/mesa/drm.git

cd drm

git checkout -b libdrm-2.4.102 libdrm-2.4.102 or
git checkout tags/tagname -b
like above:
git checkout tags/libdrm-2.4.102 -b libdrm-2.4.102

config:
git config --global user.email "songpeng24@msn.com"
git config --global user.name 'songpeng22'

config status:

git config -l

project Status:
git status

在github上创建：
https://github.com/songpeng22/CMake_QT_03_Qml-Standard.git

git init
git add README.md
git add *
git commit -m "first commit"
git remote add origin https://github.com/songpeng22/CMake_QT_03_Qml-Standard.git
git push -u origin master

宋鹏 2019-03-02 14:54 发表评论