git getting started

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 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

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

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

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

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

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

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

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

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

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

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 ++++----
:

巴特西

git getting started

最新文章

热门文章