git getting started

最新推荐文章于 2024-09-09 11:11:10 发布
最新推荐文章于 2024-09-09 11:11:10 发布
阅读量181 收藏
点赞数
文章标签： git 运维
原文链接：http://www.cnblogs.com/dannykong/p/10734015.html
版权

2019/4/25--

after committing to blessed.

modify dependency file to download file so as to get latest!

 

git status:

on what branch

modification

git diff:

git branch:

git log --stat

see all commit

 

1. setup repository

local 

fork: 

blessed

2. commit, push and pull

2.1 commit staged changes

2.2 git push origin

      git remote -v

2.3 in codebeamer, enter in fork, send pull request (develop-->develop)

3. merge

right way?

4. baseline

2.1 create tag

2.2 push tag

3. check work

see blessed?

4. relate task to commit

 

 


kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git push fork
fatal: 'fork' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git remote -v
blessed ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-blessed (fetch)
blessed ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-blessed (push)

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git status
On branch develop
Your branch is up-to-date with 'blessed/develop'.
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:   make/prj_default/m_project_cfg.mak

no changes added to commit (use "git add" and/or "git commit -a")

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git diff
diff --git a/make/prj_default/m_project_cfg.mak b/make/prj_default/m_project_cfg.mak
index 091704c..818832f 100644
--- a/make/prj_default/m_project_cfg.mak
+++ b/make/prj_default/m_project_cfg.mak
@@ -66,8 +66,8 @@ include $(W_POT_AR_WORK_PATH)/make/post_build_cfg.mak
 #--- pot generic variant --- default / debug_uart / debug_xcp ---#
 POT_GENERIC_VARIANT = default

-#--- latch variant --- Witte / Brose / Nissan ---#
-LATCH_VARIANT = Witte
+#--- latch variant --- Witte / Brose / Nissan /Magna ---#^M
+LATCH_VARIANT = Magna^M
diff --git a/make/prj_default/m_project_cfg.mak b/make/prj_default/m_project_cfg.mak
index 091704c..818832f 100644
--- a/make/prj_default/m_project_cfg.mak
+++ b/make/prj_default/m_project_cfg.mak
@@ -66,8 +66,8 @@ include $(W_POT_AR_WORK_PATH)/make/post_build_cfg.mak
 #--- pot generic variant --- default / debug_uart / debug_xcp ---#
 POT_GENERIC_VARIANT = default

-#--- latch variant --- Witte / Brose / Nissan ---#
-LATCH_VARIANT = Witte
+#--- latch variant --- Witte / Brose / Nissan /Magna ---#^M
+LATCH_VARIANT = Magna^M

 #--- ecu abstraction variant --- mgb_relay / mgb_halfbridge ---#
 ECU_AB_VARIANT = mgb_halfbridge
@@ -129,9 +129,9 @@ IMPORT_SCI_HEADER_PATH  += -I M_pot_ar_hmi/Mod_HMI/inc
 IMPORT_SCI_HEADER_PATH  += -I M_pot_ar_hmi/Mod_NetworkButton/inc
 IMPORT_SCI_HEADER_PATH  += -I M_pot_ar_hmi/Mod_SensorButton/inc
 IMPORT_SCI_HEADER_PATH  += -I M_pot_ar_hmi/inc
-IMPORT_SCI_HEADER_PATH  += -I M_pot_ar_latch/Mod_SensorLatch/inc
-IMPORT_SCI_HEADER_PATH  += -I M_pot_ar_latch/Mod_LatchControl/inc
-IMPORT_SCI_HEADER_PATH  += -I M_pot_ar_latch/inc
+#IMPORT_SCI_HEADER_PATH  += -I private/M_pot_ar_latch/Mod_SensorLatch/inc^M
+#IMPORT_SCI_HEADER_PATH  += -I private/M_pot_ar_latch/Mod_LatchControl/inc^M
+#IMPORT_SCI_HEADER_PATH  += -I private/M_pot_ar_latch/inc^M
 IMPORT_SCI_HEADER_PATH  += -I M_pot_ar_parameter/Mod_Parameter/inc
 IMPORT_SCI_HEADER_PATH  += -I $(W_POT_AR_CFG_PATH)/Mod_BusControl/inc
 IMPORT_SCI_HEADER_PATH  += -I $(W_POT_AR_CFG_PATH)/Mod_MainControl/inc
@@ -238,7 +238,7 @@ LIBRARY_QAC += M_pot_ar_ecu_ab/output/$(PROJECT_NAME)/library/M_pot_ar_ecu_ab_$(
 LIBRARY_QAC += M_pot_ar_diagnosis/output/$(PROJECT_NAME)/library/M_pot_ar_diagnosis_$(VARIANT).lib
 LIBRARY_QAC += M_pot_ar_eol/output/$(PROJECT_NAME)/library/M_pot_ar_eol_$(VARIANT).lib
 LIBRARY_QAC += M_pot_ar_hmi/output/$(PROJECT_NAME)/library/M_pot_ar_hmi_$(VARIANT).lib
-LIBRARY_QAC += M_pot_ar_latch/output/$(PROJECT_NAME)/library/M_pot_ar_latch_$(LATCH_VARIANT)_$(VARIANT).lib
+#LIBRARY_QAC += library/L_pot_ar_latch/lib/M_pot_ar_latch_$(LATCH_VARIANT)_$(VARIANT).lib^M
 LIBRARY_QAC += M_pot_ar_movement/output/$(PROJECT_NAME)/library/M_pot_ar_movement_$(VARIANT).lib
 LIBRARY_QAC += M_pot_ar_position/output/$(PROJECT_NAME)/library/M_pot_ar_position_$(VARIANT).lib
 LIBRARY_QAC += M_pot_ar_system/output/$(PROJECT_NAME)/library/M_pot_ar_system_$(VARIANT).lib
@@ -264,7 +264,7 @@ MAKE_QAC   += M_pot_ar_ecu_ab/make/$(ECU_AB_VARIANT)
 MAKE_QAC   += M_pot_ar_diagnosis/make/default
 MAKE_QAC   += M_pot_ar_eol/make/default
 MAKE_QAC   += M_pot_ar_hmi/make/default
-MAKE_QAC   += M_pot_ar_latch/make/$(LATCH_VARIANT)
+#MAKE_QAC   += private/M_pot_ar_latch/make/$(LATCH_VARIANT)^M
 MAKE_QAC   += M_pot_ar_movement/make/default
 MAKE_QAC   += M_pot_ar_system/make/default
 MAKE_QAC   += M_pot_ar_parameter/make/default

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git status
On branch develop
Your branch is up-to-date with 'blessed/develop'.
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:   make/prj_default/m_project_cfg.mak

no changes added to commit (use "git add" and/or "git commit -a")

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git branch
* develop

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git remote -v
blessed ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-blessed (fetch)
blessed ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-blessed (push)
fork    ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-kongdel (fetch)
fork    ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-kongdel (push)

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$

kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git log --stat
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date:   Thu Apr 25 16:51:52 2019 +0800

    latch magna merge

 make/prj_default/m_project_cfg.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 15:16:17 2019 +0530

    #279452 : GWM : PG : Makefile updated for POSTBUILD

    GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
    its folder

 Makefile                           |   2 +-
 make/post_build_cfg.mak            |   4 +-
 make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
 make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
 make/prj_sbl/generate_checksum.bat |  24 ------
 make/prj_sbl/linker_ctrl_file.ld   |  62 ---------------
 make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
 7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date:   Thu Apr 25 16:51:52 2019 +0800

    latch magna merge

 make/prj_default/m_project_cfg.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 15:16:17 2019 +0530

    #279452 : GWM : PG : Makefile updated for POSTBUILD

    GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
    its folder

 Makefile                           |   2 +-
 make/post_build_cfg.mak            |   4 +-
 make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
 make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
 make/prj_sbl/generate_checksum.bat |  24 ------
 make/prj_sbl/linker_ctrl_file.ld   |  62 ---------------
 make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
 7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 12:20:58 2019 +0530
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date:   Thu Apr 25 16:51:52 2019 +0800

    latch magna merge

 make/prj_default/m_project_cfg.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 15:16:17 2019 +0530

    #279452 : GWM : PG : Makefile updated for POSTBUILD

    GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
    its folder

 Makefile                           |   2 +-
 make/post_build_cfg.mak            |   4 +-
 make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
 make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
 make/prj_sbl/generate_checksum.bat |  24 ------
 make/prj_sbl/linker_ctrl_file.ld   |  62 ---------------
 make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
 7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 12:20:58 2019 +0530

    #279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date:   Thu Apr 25 16:51:52 2019 +0800

    latch magna merge

 make/prj_default/m_project_cfg.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 15:16:17 2019 +0530

    #279452 : GWM : PG : Makefile updated for POSTBUILD

    GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
    its folder

 Makefile                           |   2 +-
 make/post_build_cfg.mak            |   4 +-
 make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
 make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
 make/prj_sbl/generate_checksum.bat |  24 ------
 make/prj_sbl/linker_ctrl_file.ld   |  62 ---------------
 make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
 7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 12:20:58 2019 +0530

    #279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

    GWM: PG : Makefile fix for QAC and Duplicate macro definition

:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date:   Thu Apr 25 16:51:52 2019 +0800

    latch magna merge

 make/prj_default/m_project_cfg.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 15:16:17 2019 +0530

    #279452 : GWM : PG : Makefile updated for POSTBUILD

    GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
    its folder

 Makefile                           |   2 +-
 make/post_build_cfg.mak            |   4 +-
 make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
 make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
 make/prj_sbl/generate_checksum.bat |  24 ------
 make/prj_sbl/linker_ctrl_file.ld   |  62 ---------------
 make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
 7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 12:20:58 2019 +0530

    #279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

    GWM: PG : Makefile fix for QAC and Duplicate macro definition

 Makefile                           | 1 +
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date:   Thu Apr 25 16:51:52 2019 +0800

    latch magna merge

 make/prj_default/m_project_cfg.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 15:16:17 2019 +0530

    #279452 : GWM : PG : Makefile updated for POSTBUILD

    GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
    its folder

 Makefile                           |   2 +-
 make/post_build_cfg.mak            |   4 +-
 make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
 make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
 make/prj_sbl/generate_checksum.bat |  24 ------
 make/prj_sbl/linker_ctrl_file.ld   |  62 ---------------
 make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
 7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 12:20:58 2019 +0530

    #279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

    GWM: PG : Makefile fix for QAC and Duplicate macro definition

 Makefile                           | 1 +
 make/prj_default/m_project_cfg.mak | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date:   Thu Apr 25 16:51:52 2019 +0800

    latch magna merge

 make/prj_default/m_project_cfg.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 15:16:17 2019 +0530

    #279452 : GWM : PG : Makefile updated for POSTBUILD

    GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
    its folder

 Makefile                           |   2 +-
 make/post_build_cfg.mak            |   4 +-
 make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
 make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
 make/prj_sbl/generate_checksum.bat |  24 ------
 make/prj_sbl/linker_ctrl_file.ld   |  62 ---------------
 make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
 7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 12:20:58 2019 +0530

    #279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

    GWM: PG : Makefile fix for QAC and Duplicate macro definition

 Makefile                           | 1 +
 make/prj_default/m_project_cfg.mak | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date:   Thu Apr 25 16:51:52 2019 +0800

    latch magna merge

 make/prj_default/m_project_cfg.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 15:16:17 2019 +0530

    #279452 : GWM : PG : Makefile updated for POSTBUILD

    GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
    its folder

 Makefile                           |   2 +-
 make/post_build_cfg.mak            |   4 +-
 make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
 make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
 make/prj_sbl/generate_checksum.bat |  24 ------
 make/prj_sbl/linker_ctrl_file.ld   |  62 ---------------
 make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
 7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 12:20:58 2019 +0530

    #279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

    GWM: PG : Makefile fix for QAC and Duplicate macro definition

 Makefile                           | 1 +
 make/prj_default/m_project_cfg.mak | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
Date:   Wed Mar 20 15:30:21 2019 +0530

    #266094 : GWM :PG : linker file update to make bootabale

:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date:   Thu Apr 25 16:51:52 2019 +0800

    latch magna merge

 make/prj_default/m_project_cfg.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 15:16:17 2019 +0530

    #279452 : GWM : PG : Makefile updated for POSTBUILD

    GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
    its folder

 Makefile                           |   2 +-
 make/post_build_cfg.mak            |   4 +-
 make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
 make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
 make/prj_sbl/generate_checksum.bat |  24 ------
 make/prj_sbl/linker_ctrl_file.ld   |  62 ---------------
 make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
 7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 12:20:58 2019 +0530

    #279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

    GWM: PG : Makefile fix for QAC and Duplicate macro definition

 Makefile                           | 1 +
 make/prj_default/m_project_cfg.mak | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
Date:   Wed Mar 20 15:30:21 2019 +0530

    #266094 : GWM :PG : linker file update to make bootabale

    GWM :PG : linker file update to make bootabale

:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date:   Thu Apr 25 16:51:52 2019 +0800

    latch magna merge

 make/prj_default/m_project_cfg.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 15:16:17 2019 +0530

    #279452 : GWM : PG : Makefile updated for POSTBUILD

    GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
    its folder

 Makefile                           |   2 +-
 make/post_build_cfg.mak            |   4 +-
 make/prj_pbl/linker_ctrl_file.ld   | 110 ---------------------------
 make/prj_pbl/m_project_cfg.mak     | 150 -------------------------------------
 make/prj_sbl/generate_checksum.bat |  24 ------
 make/prj_sbl/linker_ctrl_file.ld   |  62 ---------------
 make/prj_sbl/m_project_cfg.mak     | 130 --------------------------------
 7 files changed, 3 insertions(+), 479 deletions(-)

commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date:   Fri Mar 29 12:20:58 2019 +0530

    #279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition

    GWM: PG : Makefile fix for QAC and Duplicate macro definition

 Makefile                           | 1 +
 make/prj_default/m_project_cfg.mak | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
Date:   Wed Mar 20 15:30:21 2019 +0530

    #266094 : GWM :PG : linker file update to make bootabale

    GWM :PG : linker file update to make bootabale

 make/prj_default/linker_ctrl_file.ld | 8 ++++----
:

转载于:https://www.cnblogs.com/dannykong/p/10734015.html

weixin_30687587
关注
Git: getting started
weixin_39166189的博客
05-15 322
Contents从0开始开始之前，配置用户名和email初始化代码仓库 `git init`将已有项目代码纳入 Git 管理直接用Git新建项目并纳入管理最常用的命令Git 的暂存区和工作区Git 对文件重命名 从0开始 开始之前，配置用户名和email $ git config --global user.name 'my_name' $ git config --global user.email 'my_email@domain.com' --global 是啥意思呢？ system：对系统所有
Git：Getting started
11-07 350
版本管理： SCCS：unix的标准 RCS：gnu的版本控制系统，适合个人本地开发 CVS：适合联网开发 SVN（开源）：subversion，并发式版本控制系统，取代CVS GIT（开源）：分布式版本控制系统，适合linux开发 #############################################################
基础介绍---4.Git Getting Started
weixin_45661573的博客
11-09 253
基础介绍---4.Git Getting StartedGit 简单应用学习目标学习内容练习仓库资源与工具 Git 简单应用 学习目标 能够使用常见的 Git 命令，以便在后面的任务中可以将自己的代码提交到 GitHub 上，并且可以使用 GitHub 可以友好的和小伙伴一起协作打怪升级。 学习内容 如何在系统上安装 Git 如何配置 Git 基本信息：git config 如何把文件增加到.gitignore里以忽略它 如何初始化版本库：git init 如何查看仓库的状态：git status 如何把
git-getting-started:Git 入门教程
06-06
n00bs 的 Git 和 Github 入门# 本教程将帮助您开始使用 Git 和 Github。 它的目标是 Git n00bs。 从下载所需的 Git 软件 初始化一个新的 Git 仓库## 如果要创建一个由 Git 管理的新目录，则必须先对其进行初始化。 $ mkdir myapp $ cd myapp $ git init 这将创建一个新目录.git并在那里添加一些与 git 相关的内容。 您将提交的所有源代码都将放置在这里。 创建一个新文件## 使用您喜欢的编辑器在myapp目录中创建一个新文件，并向其中添加一些内容，如下所示。 在 nix 机器上，您可以执行以下操作。 $ cd myapp # # In case you are not in myapp directory $ echo " hello Git " >> hello.txt 检查您的 Git
gitstarted：GitStarted是在GitHub上探索开源项目的理想场所。 根据您过去的开源贡献经验获得项目建议
02-04
GitStarted是在GitHub上探索开源项目的理想场所。 仅通过使用GitHub凭据登录，即可根据您过去的开源贡献获得项目建议。 根据您使用的语言，在您自己的/已贡献存储库中拥有的星号和叉子的数量，我们向您显示一个满足您当前在开源开发方面的专业水平的项目列表。 产品特点 条形图说明了您在基于GitHub的开源项目中使用的不同编程语言。 一个搜索框，可根据任何关键字从我们的推荐列表中过滤出项目。 喜欢我们推荐的任何项目吗？ 大！ 只需单击该项目即可进行进一步探索。 请参阅图表，说明该项目中已使用的各种语言。 直接阅读该项目的README.md，以更好地理解它并开始进行贡献。
getting-started-with-git:git入门指南
05-26
Git入门 在Linux，Mac OS和Windows上的命令行中了解如何使用Git和GitHub 执照 除非另有说明，否则此存储库中的所有内容均受以下许可证的保护： Git入门已获得。 基于的工作
getting-started-with-java.rar_Getting Started
09-23
本资源“getting-started-with-java.rar”是针对那些想要踏入Java世界的新手们的一份详尽指南。这份名为"Getting Started"的PDF文档，将引领读者逐步了解并掌握Java的基础知识。 1. **Java简介**：Java是由Sun ...
Getting Started with Git
12-29
简要介绍如何使用git。图文并排，精美排版。
gettingStarted
03-04
$ git clone https://github.com/heroku/node-js-getting-started.git # or clone your own fork $ cd node-js-getting-started $ npm install $ npm start 您的应用程序现在应该在上运行。 部署到Heroku $ heroku...
Getting Started - Installing Git
BLOG域名:programb.blog.csdn.net
04-22 291
Git --local-branching-on-the-cheap About Documentation Reference Book Videos External Links Downloads Community This book is available in English. Full translation available in българ...
Git的安装和详细使用示例
Blossom
02-01 2793
git的安装和使用示例 git简单使用 参考教程：https://www.yiibai.com/git/git_life_cycle.html 常用的命令 yitiandeMacBook-Pro:~ yitian$ git usage: git [--version] [--help] [-C <path>] [-c <name>=<value>] ...
git: [started] preparing...
qq_44013802的博客
04-01 2390
ESLint is disabled since its execution has not been approved or denied yet 可能是没下载eslint 下载后 右下角可能没开开
笔记：Gitlab-CI部署流程
weixin_34090562的博客
03-28 1017
Gitlab-CI部署流程 ssh连接服务器 触发条件 当用户推送最新代码至master分支时，trigger gitlab-ci 原理 利用gitlab自动化在gitlab打包 打包后的文件利用ssh推送至服务器 读取gitlab-ci.yml文件 .gitlab-ci.yml配置文件详解 image: node:8 # 拉取node version:8 的docker镜...
如何让 Gitlab 的 Runner 在构建时拉取 Git Submodules 仓库
lindexi
04-01 2496
默认的 GitLab 的 Runner 在构建时不会去拉取 Git Submodules 仓库，将会提示 Skipping Git submodules setup 跳过初始化 Git Submodule 仓库 如官方文档 的描述，只需要加上以下代码在 .gitlab-ci.yml 文件即可 variables: GIT_SUBMODULE_STRATEGY: recursive # 拉...
git sha计算
weixin_30652491的博客
05-07 472
import Hashes from "jshashes"; const sha1 = new Hashes.SHA1().setUTF8(true); const getStringByteLength = function(str) { var totalLength = 0; var charCode; for (var i = 0; i &...
git commit提交时报错`Stashing changes...[started] `.
zhangvalue的博客
11-19 1681
在将代码提交到本地仓库的时候：git commit提交时报错Stashing changes...[started] 项目中使用了husky, 这个会在你git commit的时候先执行里面的严谨模式, 对代码进行检查, 有error就会终止提交 git commit前检测husky与pre-commit 解决方案 不按要求改的话, 提交的时候这样提交, 就可以绕过了eslint的检查了 git commit -m "提交页面备注 绕过eslint检查" --no-verify ...
git repository初始化
onlyliii的博客
04-19 1020
Command line instructions Git global setup git config --global user.name "name" git config --global user.email "email@aa.com" Create a new repository git clone git repository cd dir touch README.md g...
git的使用和gdb工具
大学生一枚
09-07 435
程序的发布模式有两种，debug和release，我们一般调试代码是用debug模式，由于gcc/g++编译出来的二进制文件默认是release模式，所以我们需要在后面加上-g选项，使其变成debug模式。gdb具有记忆功能，可以自动记忆上一个命令，点击回车可以执行下一个命令。disable/enable 断点编号：可以打开/关闭断点。list/l 行号/文件名：可以打印出代码在屏幕上。display 变量编号：可以把变量长显示在屏幕上。b 文件名/行号：在第几行打印断点。gdb 文件名：打开gdb工具。
前端代码规范- Commit 提交规范
最新发布
zhudapeng929的博客
09-09 1484
约定式提交（Conventional Commits）是一种用于代码版本控制的规范，旨在通过明确和标准化提交信息来提高代码协作质量和效率。其基本原则是通过规定提交信息的结构和语义来提高代码版本控制的可读性、可维护性和自动化程度。约定式提交规范通常要求提交信息包括一个描述性的"类型"、一个可选的"作用域"、一个用于简洁说明的"主题"，以及可选的"正文"和"尾部"等组成部分。
评论
添加红包

请填写红包祝福语或标题

个

红包个数最小为10个

元

红包金额最低5元

当前余额3.43元 前往充值 >
需支付：10.00元
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付元
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明：

1.余额是钱包充值的虚拟货币，按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载，可以购买VIP、付费专栏及课程。

余额充值