修改文件后,如何提交到git服务器
2016-11-19 15:13
375 查看
修改文件后,如何提交到git服务器?
(1)首先需要add,比如.config是被修改的文件,则
git add .config
(2)然后执行git commit -m "modify .config for some reason"
(3)然后git push 到git服务器
(4)更新:git pull
(5)查看log:git log
如下是全部过程:
root@linux:/study/linux-git/linux-git/linux-3.18.3# git diff
diff --git a/linux-3.18.3/.config b/linux-3.18.3/.config
index b06c025..039c21d 100644
--- a/linux-3.18.3/.config
+++ b/linux-3.18.3/.config
@@ -5877,10 +5877,6 @@ CONFIG_USBIP_VHCI_HCD=y
CONFIG_USBIP_HOST=y
CONFIG_USBIP_DEBUG=y
# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_TUSB6010 is not set
-# CONFIG_USB_MUSB_UX500 is not set
-# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_HOST=y
diff --git a/linux-3.18.3/arch/x86/configs/baytrail_config b/linux-3.18.3/arch/x86/configs/baytrail_config
index b06c025..039c21d 100644
--- a/linux-3.18.3/arch/x86/configs/baytrail_config
+++ b/linux-3.18.3/arch/x86/configs/baytrail_config
@@ -5877,10 +5877,6 @@ CONFIG_USBIP_VHCI_HCD=y
CONFIG_USBIP_HOST=y
CONFIG_USBIP_DEBUG=y
# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_TUSB6010 is not set
-# CONFIG_USB_MUSB_UX500 is not set
-# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_HOST=y
root@linux:/study/linux-git/linux-git/linux-3.18.3# git commit -m "modify .config and baytrail_config for compile err"
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
modified: .config
modified: arch/x86/configs/baytrail_config
no changes added to commit
root@linux:/study/linux-git/linux-git/linux-3.18.3# git add .config
root@linux:/study/linux-git/linux-git/linux-3.18.3# git add arch/x86/configs/baytrail_config
root@linux:/study/linux-git/linux-git/linux-3.18.3# git commit -m "modify .config and baytrail_config for compile err"
[master 66a45f9] modify .config and baytrail_config for compile err
2 files changed, 8 deletions(-)
root@linux:/study/linux-git/linux-git/linux-3.18.3#
root@linux:/study/linux-git/linux-git/linux-3.18.3# git push
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.
Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.
See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)
git@192.168.0.106's password:
Counting objects: 7, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (7/7), 606 bytes | 0 bytes/s, done.
Total 7 (delta 5), reused 0 (delta 0)
To git@192.168.0.106:/home/prj_git/linux-git.git/
ed83ada..66a45f9 master -> master
root@linux:/study/linux-git/linux-git/linux-3.18.3# git pull
git@192.168.0.106's password:
Already up-to-date.
root@linux:/study/linux-git/linux-git/linux-3.18.3# git log
commit 66a45f9ff41817d5333fb37355d41a7711bae681
Author: linux <linux@192.168.0.106>
Date: Tue Jan 27 00:21:27 2015 +0800
modify .config and baytrail_config for compile err
commit ed83ada1735194cfd4c9baea3f7417ef166247a7
Author: linux <linux@192.168.0.106>
Date: Mon Jan 26 23:23:25 2015 +0800
add .config to git
commit 03d9cc9b4d2c65b2f6b9272ae9bb2aaf772f3a39
Author: linux <linux@192.168.0.106>
Date: Mon Jan 26 23:22:00 2015 +0800
add baytrail_config
commit 6ecdad3d5e682c09108887c5a0fcd884b3f1b84b
Author: linux <linux@192.168.0.106>
Date: Sun Jan 25 23:18:40 2015 +0800
add git-test.txt
commit 1216e0790b45c59916c2ab75be15a6e563d3a540
Author: linux <linux@192.168.0.106>
Date: Sun Jan 25 22:30:59 2015 +0800
git add linux-3.18.3
root@linux:/study/linux-git/linux-git/linux-3.18.3#
root@linux:/study/linux-git/linux-git/linux-3.18.3#
(1)首先需要add,比如.config是被修改的文件,则
git add .config
(2)然后执行git commit -m "modify .config for some reason"
(3)然后git push 到git服务器
(4)更新:git pull
(5)查看log:git log
如下是全部过程:
root@linux:/study/linux-git/linux-git/linux-3.18.3# git diff
diff --git a/linux-3.18.3/.config b/linux-3.18.3/.config
index b06c025..039c21d 100644
--- a/linux-3.18.3/.config
+++ b/linux-3.18.3/.config
@@ -5877,10 +5877,6 @@ CONFIG_USBIP_VHCI_HCD=y
CONFIG_USBIP_HOST=y
CONFIG_USBIP_DEBUG=y
# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_TUSB6010 is not set
-# CONFIG_USB_MUSB_UX500 is not set
-# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_HOST=y
diff --git a/linux-3.18.3/arch/x86/configs/baytrail_config b/linux-3.18.3/arch/x86/configs/baytrail_config
index b06c025..039c21d 100644
--- a/linux-3.18.3/arch/x86/configs/baytrail_config
+++ b/linux-3.18.3/arch/x86/configs/baytrail_config
@@ -5877,10 +5877,6 @@ CONFIG_USBIP_VHCI_HCD=y
CONFIG_USBIP_HOST=y
CONFIG_USBIP_DEBUG=y
# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_TUSB6010 is not set
-# CONFIG_USB_MUSB_UX500 is not set
-# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_HOST=y
root@linux:/study/linux-git/linux-git/linux-3.18.3# git commit -m "modify .config and baytrail_config for compile err"
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
modified: .config
modified: arch/x86/configs/baytrail_config
no changes added to commit
root@linux:/study/linux-git/linux-git/linux-3.18.3# git add .config
root@linux:/study/linux-git/linux-git/linux-3.18.3# git add arch/x86/configs/baytrail_config
root@linux:/study/linux-git/linux-git/linux-3.18.3# git commit -m "modify .config and baytrail_config for compile err"
[master 66a45f9] modify .config and baytrail_config for compile err
2 files changed, 8 deletions(-)
root@linux:/study/linux-git/linux-git/linux-3.18.3#
root@linux:/study/linux-git/linux-git/linux-3.18.3# git push
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.
Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.
See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)
git@192.168.0.106's password:
Counting objects: 7, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (7/7), 606 bytes | 0 bytes/s, done.
Total 7 (delta 5), reused 0 (delta 0)
To git@192.168.0.106:/home/prj_git/linux-git.git/
ed83ada..66a45f9 master -> master
root@linux:/study/linux-git/linux-git/linux-3.18.3# git pull
git@192.168.0.106's password:
Already up-to-date.
root@linux:/study/linux-git/linux-git/linux-3.18.3# git log
commit 66a45f9ff41817d5333fb37355d41a7711bae681
Author: linux <linux@192.168.0.106>
Date: Tue Jan 27 00:21:27 2015 +0800
modify .config and baytrail_config for compile err
commit ed83ada1735194cfd4c9baea3f7417ef166247a7
Author: linux <linux@192.168.0.106>
Date: Mon Jan 26 23:23:25 2015 +0800
add .config to git
commit 03d9cc9b4d2c65b2f6b9272ae9bb2aaf772f3a39
Author: linux <linux@192.168.0.106>
Date: Mon Jan 26 23:22:00 2015 +0800
add baytrail_config
commit 6ecdad3d5e682c09108887c5a0fcd884b3f1b84b
Author: linux <linux@192.168.0.106>
Date: Sun Jan 25 23:18:40 2015 +0800
add git-test.txt
commit 1216e0790b45c59916c2ab75be15a6e563d3a540
Author: linux <linux@192.168.0.106>
Date: Sun Jan 25 22:30:59 2015 +0800
git add linux-3.18.3
root@linux:/study/linux-git/linux-git/linux-3.18.3#
root@linux:/study/linux-git/linux-git/linux-3.18.3#
相关文章推荐
- pycharm 如何不提交修改过的文件到git
- 如何在git提交时忽略已提交过但本地已修改的文件
- git提交修改时服务器发出的邮件没有diff信息
- ZenCart如何整站转移到另一台服务器 从服务器空间上下的zencart 模板 放到 本地测试 修改 哪些配置文件内容??
- post提交/文件上传服务器修改
- git - 查看已暂存和未暂存的更新以及文件修改之后暂存区、上次提交过的不同
- git使用:如何进行版本回退或只是修改已提交的commit
- git 如何添加指定的文件提交.
- git基础学习(二):对修改的文件进行提交 git diff 和 git status
- git 提交大文件到远程服务器设置
- git 提交时,如何忽略某些文件
- git - 查看文件是否提交以及是否提交到远程服务器
- C#如何用WebClient动态提交文件至Web服务器和设定Http响应超时时间
- 如何控制上传附件的大小?在没有上传到服务器上就能判断出来 - 用Applet(签名) + JavaScript在提交前先判断本地文件的大小。
- 如何创建.gitignore文件,忽略不必要提交的文件
- git学习笔记-如何移除或忽略(ignore)已经提交给git管理的文件
- 如何用服务器文件管理系统记录共享文件的访问日志、记录共享文件复制、修改、删除和剪切等操作?
- git如何查看某一个文件的详细提交记录
- 如何永久删除git仓库中敏感文件的提交记录
- Git如何修改已提交Change