..." to update what will be committed">
devbox
小丑西瓜9
这个屌丝很懒，什么也没留下！
关注作者
热门标签
热门文章
当前位置:   article > 正文

Git提交与恢复

作者：小丑西瓜9 | 2024-03-18 17:44:07

赞

踩

use "git add ..." to update what will be committed

Git提交与恢复

提交修改

git add --all # 提交所有修改文件
git add file file # 提交部分修改文件

  1. $ git status
  2. On branch master
  3. Your branch is up-to-date with 'origin/master'.
  4. Changes to be committed:
  5.   (use "git reset HEAD <file>..." to unstage)
  6.  
  7.         modified:   src/Makefile.am
  8.  
  9. Untracked files:
  10.   (use "git add <file>..." to include in what will be committed)
  11.  
  12.         spice-gtk.IAB
  13.         spice-gtk.IAD
  14.         spice-gtk.IMB
  15.         spice-gtk.IMD
  16.         spice-gtk.PFI
  17.         spice-gtk.PO
  18.         spice-gtk.PR
  19.         spice-gtk.PRI
  20.         spice-gtk.PS
  21.         spice-gtk.SearchResults
  22.         spice-gtk.WK3
  23.  
  24.  
  25. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  26. $ git add --all
  27.  
  28. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  29. $
回退提交的文件

git reset file # 将执行过git add的某个文件从缓存区恢复到工作文件
git reset -- . # 将执行过git add的所有文件从缓存区恢复到工作文件
git reset --soft id # 将版本回退到对应的commit但保留之后所有commit的修改
git reset --hard id # 将版本回退到对应的commit并放弃之后所有commit的修改

  1. $ git status
  2. On branch master
  3. Your branch is up-to-date with 'origin/master'.
  4. Changes to be committed:
  5.   (use "git reset HEAD <file>..." to unstage)
  6.  
  7.         modified:   src/Makefile.am
  8.  
  9. Untracked files:
  10.   (use "git add <file>..." to include in what will be committed)
  11.  
  12.         spice-gtk.IAB
  13.         spice-gtk.IAD
  14.         spice-gtk.IMB
  15.         spice-gtk.IMD
  16.         spice-gtk.PFI
  17.         spice-gtk.PO
  18.         spice-gtk.PR
  19.         spice-gtk.PRI
  20.         spice-gtk.PS
  21.         spice-gtk.SearchResults
  22.         spice-gtk.WK3
  23.  
  24.  
  25. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  26. $ git reset src/Makefile.am
  27. Unstaged changes after reset:
  28. M       src/Makefile.am
  29.  
  30. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  31. $ git status
  32. On branch master
  33. Your branch is up-to-date with 'origin/master'.
  34. Changes not staged for commit:
  35.   (use "git add <file>..." to update what will be committed)
  36.   (use "git checkout -- <file>..." to discard changes in working directory)
  37.  
  38.         modified:   src/Makefile.am
  39.  
  40. Untracked files:
  41.   (use "git add <file>..." to include in what will be committed)
  42.  
  43.         spice-gtk.IAB
  44.         spice-gtk.IAD
  45.         spice-gtk.IMB
  46.         spice-gtk.IMD
  47.         spice-gtk.PFI
  48.         spice-gtk.PO
  49.         spice-gtk.PR
  50.         spice-gtk.PRI
  51.         spice-gtk.PS
  52.         spice-gtk.SearchResults
  53.         spice-gtk.WK3
  54.  
  55. no changes added to commit (use "git add" and/or "git commit -a")
  56.  
  57. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  58. $ git add --all
  59.  
  60. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  61. $ git reset -- .
  62. Unstaged changes after reset:
  63. M       src/Makefile.am
  64.  
  65. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  66. $ git status
  67. On branch master
  68. Your branch is up-to-date with 'origin/master'.
  69. Changes not staged for commit:
  70.   (use "git add <file>..." to update what will be committed)
  71.   (use "git checkout -- <file>..." to discard changes in working directory)
  72.  
  73.         modified:   src/Makefile.am
  74.  
  75. Untracked files:
  76.   (use "git add <file>..." to include in what will be committed)
  77.  
  78.         spice-gtk.IAB
  79.         spice-gtk.IAD
  80.         spice-gtk.IMB
  81.         spice-gtk.IMD
  82.         spice-gtk.PFI
  83.         spice-gtk.PO
  84.         spice-gtk.PR
  85.         spice-gtk.PRI
  86.         spice-gtk.PS
  87.         spice-gtk.SearchResults
  88.         spice-gtk.WK3
  89.  
  90. no changes added to commit (use "git add" and/or "git commit -a")
  91.  
  92. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  93. $ git status
  94. On branch master
  95. Your branch is up-to-date with 'origin/master'.
  96. Changes not staged for commit:
  97.   (use "git add <file>..." to update what will be committed)
  98.   (use "git checkout -- <file>..." to discard changes in working directory)
  99.  
  100.         modified:   src/Makefile.am
  101.  
  102. Untracked files:
  103.   (use "git add <file>..." to include in what will be committed)
  104.  
  105.         spice-gtk.IAB
  106.         spice-gtk.IAD
  107.         spice-gtk.IMB
  108.         spice-gtk.IMD
  109.         spice-gtk.PFI
  110.         spice-gtk.PO
  111.         spice-gtk.PR
  112.         spice-gtk.PRI
  113.         spice-gtk.PS
  114.         spice-gtk.SearchResults
  115.         spice-gtk.WK3
  116.  
  117. no changes added to commit (use "git add" and/or "git commit -a")
  118.  
  119. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  120. $ git add --all
  121.  
  122. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  123. $ git commit -m "top"
  124. [master ff418e2] top
  125.  12 files changed, 2 insertions(+)
  126.  create mode 100644 spice-gtk.IAB
  127.  create mode 100644 spice-gtk.IAD
  128.  create mode 100644 spice-gtk.IMB
  129.  create mode 100644 spice-gtk.IMD
  130.  create mode 100644 spice-gtk.PFI
  131.  create mode 100644 spice-gtk.PO
  132.  create mode 100644 spice-gtk.PR
  133.  create mode 100644 spice-gtk.PRI
  134.  create mode 100644 spice-gtk.PS
  135.  create mode 100644 spice-gtk.SearchResults
  136.  create mode 100644 spice-gtk.WK3
  137.  
  138. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  139. $ git status
  140. On branch master
  141. Your branch is ahead of 'origin/master' by 1 commit.
  142.   (use "git push" to publish your local commits)
  143. nothing to commit, working directory clean
  144.  
  145. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  146. $ git log
  147. commit ff418e286d14eb75c3cc2227b65e79ccdc8b2b19
  148. Author: silvermagic <fwdssg@gmail.com>
  149. Date:   Thu Jun 23 14:41:16 2016 +0800
  150.  
  151.     top
  152.  
  153. commit 2293b293e83a95a9b939a04a916adf8abed1a100
  154. Author: Takao Fujiwara <tfujiwar@redhat.com>
  155. Date:   Fri Apr 15 18:09:37 2016 +0900
  156.  
  157.     Send Hangul key in KR keyboard
  158.  
  159.     Korean keyboard assigns Hangul key on the position of Right Alt and
  160.     Left Alt and Hangul keys have the different scancodes but MapVirtualKey()
  161.     returned the same scancode and could not use Hangul key on Linux desktop.
  162.  
  163.     The fix is to send the right scancode of VK_HANGUL.
  164.  
  165. commit 046de27c2eea2b3ee2ade80780f51b2ca140f92d
  166. Author: Takao Fujiwara <tfujiwar@redhat.com>
  167. Date:   Fri Apr 15 18:08:37 2016 +0900
  168.  
  169.     Send key release event for some keys in JP keyboard
  170.  
  171. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  172. $ git reset --soft 2293b293e83a95a9b939a04a916adf8abed1a100
  173.  
  174. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  175. $ git reset -- .
  176. Unstaged changes after reset:
  177. M       src/Makefile.am
  178.  
  179. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  180. $ git status
  181. On branch master
  182. Your branch is up-to-date with 'origin/master'.
  183. Changes not staged for commit:
  184.   (use "git add <file>..." to update what will be committed)
  185.   (use "git checkout -- <file>..." to discard changes in working directory)
  186.  
  187.         modified:   src/Makefile.am
  188.  
  189. Untracked files:
  190.   (use "git add <file>..." to include in what will be committed)
  191.  
  192.         spice-gtk.IAB
  193.         spice-gtk.IAD
  194.         spice-gtk.IMB
  195.         spice-gtk.IMD
  196.         spice-gtk.PFI
  197.         spice-gtk.PO
  198.         spice-gtk.PR
  199.         spice-gtk.PRI
  200.         spice-gtk.PS
  201.         spice-gtk.SearchResults
  202.         spice-gtk.WK3
  203.  
  204. no changes added to commit (use "git add" and/or "git commit -a")
  205.  
  206. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  207. $ git add src/Makefile.am
  208.  
  209. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  210. $ git commit -m "top"
  211. [master 5edeb81] top
  212.  1 file changed, 1 insertion(+)
  213.  
  214. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  215. $ git status
  216. On branch master
  217. Your branch is ahead of 'origin/master' by 1 commit.
  218.   (use "git push" to publish your local commits)
  219. Untracked files:
  220.   (use "git add <file>..." to include in what will be committed)
  221.  
  222.         spice-gtk.IAB
  223.         spice-gtk.IAD
  224.         spice-gtk.IMB
  225.         spice-gtk.IMD
  226.         spice-gtk.PFI
  227.         spice-gtk.PO
  228.         spice-gtk.PR
  229.         spice-gtk.PRI
  230.         spice-gtk.PS
  231.         spice-gtk.SearchResults
  232.         spice-gtk.WK3
  233.  
  234. nothing added to commit but untracked files present (use "git add" to track)
  235.  
  236. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  237. $ git reset --hard 2293b293e83a95a9b939a04a916adf8abed1a100
  238. HEAD is now at 2293b29 Send Hangul key in KR keyboard
  239.  
  240. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
  241. $ git status
  242. On branch master
  243. Your branch is up-to-date with 'origin/master'.
  244. Untracked files:
  245.   (use "git add <file>..." to include in what will be committed)
  246.  
  247.         spice-gtk.IAB
  248.         spice-gtk.IAD
  249.         spice-gtk.IMB
  250.         spice-gtk.IMD
  251.         spice-gtk.PFI
  252.         spice-gtk.PO
  253.         spice-gtk.PR
  254.         spice-gtk.PRI
  255.         spice-gtk.PS
  256.         spice-gtk.SearchResults
  257.         spice-gtk.WK3
  258.  
  259. nothing added to commit but untracked files present (use "git add" to track)
  260.  
  261. fwdss@DESKTOP-N07EPED MINGW64 /d/Project/spice-gtk (master)
补充修改前一次提交

git commit --amend # 比如前次commit少提交了文件，可以使用git add添加文件，然后使用此命令修改前一次提交

  1. $ git add --all
  2. $ git commit --amend
  3. [master 10e69f0] template
  4.  Date: Thu Jul 14 10:51:17 2016 +0800
  5.  4 files changed, 21 insertions(+)
  6.  create mode 100644 .gitignore
  7.  create mode 100644 CMakeLists.txt
  8.  create mode 100644 README.md
  9.  create mode 100644 main.c
临时提交和恢复

git stash # 将改动放入缓存区
git stash pop # 取出缓存区存放的内容

打补丁
  1. > git diff from-commit to-commit > diff.patch # 打包修改
  2. > git apply diff.patch # 应用修改

转载于:https://www.cnblogs.com/silvermagic/p/7665844.html

声明：本文内容由网友自发贡献，不代表【wpsshop博客】立场，版权归原作者所有，本站不承担相应法律责任。如您发现有侵权的内容，请联系我们。转载请注明出处：https://www.wpsshop.cn/w/小丑西瓜9/article/detail/264734?site
推荐阅读
相关标签

Copyright © 2003-2013 www.wpsshop.cn 版权所有，并保留所有权利。

  

闽ICP备14008679号