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 榪囩▼涓細(xì)
鍦ㄤ慨鏀瑰畬闇瑕乵erge鐨勬枃浠跺悗錛岀敤git add鍜実it status鏉ョ‘璁ebase鐘舵侊紝鐒跺悗鍐峠it rebase --continue
2. git rebase 榪囩▼涓細(xì)
鍦ㄤ慨鏀瑰畬闇瑕乵erge鐨勬枃浠跺悗錛岀敤git add鍜実it status鏉ョ‘璁ebase鐘舵侊紝鐒跺悗鍐峠it rebase --continue
]]>
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
3. push tag name to remote repo
git push origin <branchname> --tags
]]>
git log
result:
commit f46a2277acf6b1604f3268fcd3652682f23347bc (HEAD -> master)
Author: songpeng <song.peng@bizerba.com>
Date: Mon Mar 4 17:07:09 2019 +0800
鏌ョ湅鏃ュ織涓殑鏌愭鎻愪氦錛?/strong>git show f46a2277acf6b1604f3268fcd3652682f23347bc
鏌ョ湅鍚勪釜鏃ュ織閮戒慨鏀逛簡(jiǎn)鍝簺鏂囦歡錛?br />
git log --name-only
鏌ョ湅鍚勪釜鏃ュ織鏂囦歡鐨勫叿浣撲慨鏀癸細(xì)
git log -p /path_you_specified
鏌ョ湅鍚勪釜鏃ュ織鏂囦歡鐨勫叿浣撲慨鏀癸細(xì)
git log -p /path_you_specified
鏌ョ湅鏈湴浠ｇ爜淇敼鎯呭喌錛?br />宸蹭慨鏀癸紝鏈猘dd鐨勫彉鏇達(dá)細(xì)
git diff
宸瞐dd錛屾湭commit鐨勫彉鏇達(dá)細(xì)
git diff --cached
涓婇潰涓ゆ潯鍚堝茍錛?br />git diff HEAD
涓や釜commit涔嬮棿鐨勫尯鍒細(xì)
git diff 0da94be 59ff30c
鍙樻洿鏃ュ織鍐呭錛坈omment錛?
棣栧厛鏄劇ず鏈榪?嬈℃彁浜ょ殑commit:
git rebase -i HEAD~3
榪愯鍚庢樉紺哄涓?鎴戞槸鍦╳indows閲岄潰瀹夎浜?jiǎn)vim,鍐呭浼?xì)鏄窘C哄湪vim閲岋紝涓嶇煡閬撴病瀹夎vim浼?xì)濡備綍鏄窘C?錛?br />
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
縐誨姩鍏夋爣鍒版兂瑕佷慨鏀筩ommit鐨勬墍鍦ㄨ錛屽皢pick鏀規(guī)垚reword錛岀劧鍚庝繚瀛?br />鐒跺悗鍒鋒柊鐨勭晫闈㈠唴綾諱技浼?xì)鍑虹庮C綘鎯充慨鏀圭殑comment錛屽皢涔嬩慨鏀逛繚瀛樸?br />鐒跺悗榪愯錛?br />git push --force錛屽氨浼?xì)閲嶆栴C紶鍒版湇鍔″櫒錛屾洿鏂頒綘瑕佷慨鏀圭殑comment.]]>
git add *
undo add:
You can undo git add before commit with
git reset <file>
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 <remote_branch>錛?lt;local_branch>
git pull origin master:master
鏌ョ湅榪滅鍙樻洿/鍚庣畫鎿嶄綔錛?br />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 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).
]]>
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
git clone http://anongit.freedesktop.org/git/mesa/drm.gitcd glibc
git checkout glibc-2.28
clone with tagname錛?/strong>
clone with tagname錛?/strong>
cd drm
git checkout -b libdrm-2.4.102 libdrm-2.4.102
or
git checkout tags/tagname -b <branch>
like above:
git checkout tags/libdrm-2.4.102 -b libdrm-2.4.102
config:git checkout tags/tagname -b <branch>
like above:
git checkout tags/libdrm-2.4.102 -b libdrm-2.4.102
git config --global user.email "songpeng24@msn.com"
git config --global user.name 'songpeng22'
config status:
git config -l
project Status:
git status
project Status:
git status
鍦╣ithub涓婂垱寤猴細(xì)
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
]]>