Linux 下git 提交代码

作者: Ayugone | 来源:发表于2018-09-14 10:00 被阅读0次

zhangfeng@build:~/MTK6755/packages/apps/Settings$ git status
On branch HT380K-C818-DEV
Your branch is up-to-date with 'origin/HT380K-C818-DEV'.

Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

modified:   ../../../frameworks/base/core/java/com/android/server/BootReceiver.java
modified:   AndroidManifest.xml
modified:   res/values-zh-rCN/strings.xml
modified:   res/values/strings.xml
modified:   res/xml/accessibility_settings.xml
modified:   res/xml/dashboard_categories.xml
modified:   src/com/android/settings/SettingsActivity.java
modified:   src/com/android/settings/startBroadcastReceiver.java

Untracked files:
(use "git add <file>..." to include in what will be committed)

res/layout/selecet_launcher_app.xml
res/layout/select_app.xml
src/com/android/settings/selectlauncherapp/

It took 17.64 seconds to enumerate untracked files. 'status -uno'
may speed it up, but you have to be careful not to forget to add
new files yourself (see 'git help status').
no changes added to commit (use "git add" and/or "git commit -a")
zhangfeng@build:~/MTK6755/packages/apps/Settings$ git
usage: git [--version] [--help] [-C <path>] [-c name=value]
[--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
[-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
[--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
<command> [<args>]

The most commonly used git commands are:
add Add file contents to the index
bisect Find by binary search the change that introduced a bug
branch List, create, or delete branches
checkout Checkout a branch or paths to the working tree
clone Clone a repository into a new directory
commit Record changes to the repository
diff Show changes between commits, commit and working tree, etc
fetch Download objects and refs from another repository
grep Print lines matching a pattern
init Create an empty Git repository or reinitialize an existing one
log Show commit logs
merge Join two or more development histories together
mv Move or rename a file, a directory, or a symlink
pull Fetch from and integrate with another repository or a local branch
push Update remote refs along with associated objects
rebase Forward-port local commits to the updated upstream head
reset Reset current HEAD to the specified state
rm Remove files from the working tree and from the index
show Show various types of objects
status Show the working tree status
tag Create, list, delete or verify a tag object signed with GPG

'git help -a' and 'git help -g' lists available subcommands and some
concept guides. See 'git help <command>' or 'git help <concept>'
to read about a specific subcommand or concept.
zhangfeng@build:~/MTK6755/packages/apps/Settings $zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings $git add res/layout/selecet_launcher_app.xml zhangfeng@build:~/MTK6755/packages/apps/Settings$ git add res/layout/select_app.xml
zhangfeng@build:~/MTK6755/packages/apps/Settings $git add src/com/android/settings/selectlauncherapp/ zhangfeng@build:~/MTK6755/packages/apps/Settings$ git add src/com/android/settings/startBroadcastReceiver.java
zhangfeng@build:~/MTK6755/packages/apps/Settings $git add res/xml/accessibility_settings.xml zhangfeng@build:~/MTK6755/packages/apps/Settings$ git add AndroidManifest.xml
zhangfeng@build:~/MTK6755/packages/apps/Settings $git add res/values-zh-rCN/strings.xml zhangfeng@build:~/MTK6755/packages/apps/Settings$ git add res/values/strings.xml
zhangfeng@build:~/MTK6755/packages/apps/Settings $git diff src/com/android/settings/startBroadcastReceiver.java zhangfeng@build:~/MTK6755/packages/apps/Settings$ git diff src/com/android/settings/SettingsActivity.java
diff --git a/packages/apps/Settings/src/com/android/settings/SettingsActivity.java b/packages/apps/Settings/src/com/android/settings/SettingsActivity.java
index 523bfae..f00740a 100755
--- a/packages/apps/Settings/src/com/android/settings/SettingsActivity.java
+++ b/packages/apps/Settings/src/com/android/settings/SettingsActivity.java
@@ -1462,7 +1462,9 @@ public class SettingsActivity extends Activity
//}
removeTile = true;
//[BUGFIX]-MODIFY-END by SCDTABLET.(luping.feng@tcl.com), 08/01/2016,DEFECT:2630944,2717314

           } // add by juong.wang for Defect 1749789 at 2016 0308 begin

```
           }
```

            // add by juong.wang for Defect 1749789 at 2016 0308 begin
           //[BUGFIX]-Add-BEGIN?by?SCDTABLET.(huangbin.li@tcl.com),08/03/2016,2657011
           /*else if (id == R.id.led_indicator_settings) {
               boolean ledIndMenuEnable = getResources().getBoolean(R.bool.def_Settings_LED_menu_enable);

zhangfeng@build:~/MTK6755/packages/apps/Settings $zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings $git checkout src/com/android/settings/SettingsActivity.java zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings $zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings $ls AndroidManifest.xml Android.mk assets_clearmotion assets_no_clearmotion CleanSpec.mk ext jni libs MODULE_LICENSE_APACHE2 NOTICE proguard.flags res res_ext src tests wrap_alpha.py zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings $zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings $zhangfeng@build:~/MTK6755/packages/apps/Settings$ git status
On branch HT380K-C818-DEV
Your branch is up-to-date with 'origin/HT380K-C818-DEV'.

Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified:   AndroidManifest.xml
new file:   res/layout/selecet_launcher_app.xml
new file:   res/layout/select_app.xml
modified:   res/values-zh-rCN/strings.xml
modified:   res/values/strings.xml
modified:   res/xml/accessibility_settings.xml
new file:   src/com/android/settings/selectlauncherapp/AppInfo.java
new file:   src/com/android/settings/selectlauncherapp/SelectLauncherAppActivity.java
modified:   src/com/android/settings/startBroadcastReceiver.java

Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

modified:   ../../../frameworks/base/core/java/com/android/server/BootReceiver.java
modified:   res/xml/dashboard_categories.xml

It took 28.99 seconds to enumerate untracked files. 'status -uno'
may speed it up, but you have to be careful not to forget to add
new files yourself (see 'git help status').
zhangfeng@build:~/MTK6755/packages/apps/Settings $zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings $zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings $git commit -m "add first boot apk function" [HT380K-C818-DEV cc07968] add first boot apk function 9 files changed, 657 insertions(+), 2 deletions(-) create mode 100755 packages/apps/Settings/res/layout/selecet_launcher_app.xml create mode 100755 packages/apps/Settings/res/layout/select_app.xml create mode 100755 packages/apps/Settings/src/com/android/settings/selectlauncherapp/AppInfo.java create mode 100755 packages/apps/Settings/src/com/android/settings/selectlauncherapp/SelectLauncherAppActivity.java zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings $zhangfeng@build:~/MTK6755/packages/apps/Settings$ git log
commit cc0796855a680c98a9d6b89e637bb12348a6306a
Author: Zhangfeng rd_zhangfeng@jiebaodz.com
Date: Thu Sep 13 21:56:26 2018 -0400

add first boot apk function

commit 1b06cbf92f8f93783ceec1d0f692fd8b50059dfc
Merge: 45e09fe 0a76937
Author: jiebao jiebao@jiebaodz.com
Date: Fri Sep 7 23:01:31 2018 -0400

Merge branch 'HT380K-C818-DEV' of 10.10.10.148:/home/jiebao/projCode/MTK6755 into HT380K-C818-DEV

commit 45e09fed852b3debc00d2e93a6a87b528c93db47
Author: jiebao jiebao@jiebaodz.com
Date: Fri Sep 7 23:00:58 2018 -0400

update string

commit 0a76937144e27138797e417af9359d9bbd580cb6
Author: liaojingcheng rd_liaojingcheng@jiebaodz.com
Date: Thu Sep 6 21:53:42 2018 -0400

HT380K_MOS_C0A_HARD_V0.0.52

commit 99a65b4e9e262f257a124728f87e9450d620e4f7
Author: jiebao jiebao@jiebaodz.com
Date: Tue Jun 5 21:24:34 2018 -0400

add never translation

commit 967a58e72a5e5dd06bab984cad1b3174db50af14
Author: jiebaosz sz@jiebaodz.com
Date: Wed May 2 15:11:55 2018 +0800

lcm sc7798 优化

commit 16db1aa8746bc0211d92e7222d2948727b66fd4c
Author: liaojingcheng rd_liaojingcheng@jiebaodz.com
Date: Sun Apr 22 23:05:40 2018 -0400

add lcm st7798 TP: GT5688

commit 8fe74169eb1010a45843a729518d51693593108a
Merge: a3d4865 2a53ee4
Author: liaojingcheng rd_liaojingcheng@jiebaodz.com
Date: Thu Sep 6 02:38:04 2018 -0400

Merge branch 'HT380K-C818-DEV' of 10.10.10.148:/home/jiebao/projCode/MTK6755 into HT380K-C818-DEV

commit 2a53ee44addc0620e183e944cbdaf1e36a24404c
Author: jiebao jiebao@jiebaodz.com
Date: Mon Aug 13 06:04:56 2018 -0400

add add jb custom broadcas

zhangfeng@build:~/MTK6755/packages/apps/Settings $zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings$ git branch -a

HT380K-C818-DEV
HT380K-C818-GMS
remotes/origin/C818-driveronly
remotes/origin/HEAD -> origin/HT380K-C818-GMS
remotes/origin/HT368D-C818-DEV
remotes/origin/HT368D-C818-GMS
remotes/origin/HT368D-C818-GOUWANGDEV
remotes/origin/HT380D-C818-DEV
remotes/origin/HT380D-C818-ES-DEV
remotes/origin/HT380D-C818-FEIBIAO-DEV
remotes/origin/HT380D-C818-GMS
remotes/origin/HT380D-C818-HENAN-DEV
remotes/origin/HT380D-C818-NANWANG-DEV
remotes/origin/HT380D-C818-SHENCAI_DEV
remotes/origin/HT380D-C818-ZHONGTIE-DEV
remotes/origin/HT380K-C818-DEV
remotes/origin/HT380K-C818-GMS
remotes/origin/HT380K-C818-GMS_SE4750_SE4710
remotes/origin/HT380K-C818-HUARUN-DEV
remotes/origin/HT380K-C818-SURE56-DEV
remotes/origin/HT380K-C818-UCE-DEV
remotes/origin/HT380K-C818-YUANYI-GMS
remotes/origin/HT518D-C818-DEV
remotes/origin/HT518D-C818-GMS
remotes/origin/master
zhangfeng@build:~/MTK6755/packages/apps/Settings $git push origin HT380K-C818-DEV jiebao@10.10.10.148's password: Permission denied, please try again. jiebao@10.10.10.148's password: Counting objects: 126, done. Delta compression using up to 6 threads. Compressing objects: 100% (21/21), done. Writing objects: 100% (23/23), 6.56 KiB | 0 bytes/s, done. Total 23 (delta 14), reused 0 (delta 0) To jiebao@10.10.10.148:/home/jiebao/projCode/MTK6755.git 1b06cbf..cc07968 HT380K-C818-DEV -> HT380K-C818-DEV zhangfeng@build:~/MTK6755/packages/apps/Settings$
zhangfeng@build:~/MTK6755/packages/apps/Settings $zhangfeng@build:~/MTK6755/packages/apps/Settings$ git log
commit cc0796855a680c98a9d6b89e637bb12348a6306a
Author: Zhangfeng rd_zhangfeng@jiebaodz.com
Date: Thu Sep 13 21:56:26 2018 -0400

add first boot apk function

commit 1b06cbf92f8f93783ceec1d0f692fd8b50059dfc
Merge: 45e09fe 0a76937
Author: jiebao jiebao@jiebaodz.com
Date: Fri Sep 7 23:01:31 2018 -0400

Merge branch 'HT380K-C818-DEV' of 10.10.10.148:/home/jiebao/projCode/MTK6755 into HT380K-C818-DEV

commit 45e09fed852b3debc00d2e93a6a87b528c93db47
Author: jiebao jiebao@jiebaodz.com
Date: Fri Sep 7 23:00:58 2018 -0400

update string

commit 0a76937144e27138797e417af9359d9bbd580cb6
Author: liaojingcheng rd_liaojingcheng@jiebaodz.com
Date: Thu Sep 6 21:53:42 2018 -0400

HT380K_MOS_C0A_HARD_V0.0.52

commit 99a65b4e9e262f257a124728f87e9450d620e4f7
Author: jiebao jiebao@jiebaodz.com
Date: Tue Jun 5 21:24:34 2018 -0400

add never translation

commit 967a58e72a5e5dd06bab984cad1b3174db50af14
Author: jiebaosz sz@jiebaodz.com
Date: Wed May 2 15:11:55 2018 +0800

lcm sc7798 优化

commit 16db1aa8746bc0211d92e7222d2948727b66fd4c
Author: liaojingcheng rd_liaojingcheng@jiebaodz.com
Date: Sun Apr 22 23:05:40 2018 -0400

add lcm st7798 TP: GT5688

commit 8fe74169eb1010a45843a729518d51693593108a
Merge: a3d4865 2a53ee4
Author: liaojingcheng rd_liaojingcheng@jiebaodz.com
Date: Thu Sep 6 02:38:04 2018 -0400

Merge branch 'HT380K-C818-DEV' of 10.10.10.148:/home/jiebao/projCode/MTK6755 into HT380K-C818-DEV

commit 2a53ee44addc0620e183e944cbdaf1e36a24404c
Author: jiebao jiebao@jiebaodz.com
Date: Mon Aug 13 06:04:56 2018 -0400

add add jb custom broadcas

:
zhangfeng@build:~/MTK6755 $git checkout ./ zhangfeng@build:~/MTK6755$ git pull origin HT380K-C818-DEV
jiebao@10.10.10.148's password:

zhangfeng@build:~/MTK6755$ git pull origin HT380K-C818-DEV
创建推送到新分支

创建本地分支：git branch HT518D-DEV-YUNNANDIANWANG
zhangfeng@build:~/518D/MTK6755$ git push origin HT518D-DEV-YUNNANDIANWANG（本地分支）:HT518D-DEV-YUNNANDIANWANG（远程分支，没有就创建）

Linux 下git 提交代码

相关文章

网友评论

延伸阅读

深度阅读

栏目导航

热点阅读

android系统应用开发