'CM(ConfigurationManagement)/git'에 해당되는 글 5건

gitignore 설정이 작동안 할 때

1. 원인

- .gitignore 설정파일을 생성한 후 ignore할 값들을 생성했지만 제대로 작동하지 않는다

2. 해결

- 기존 캐시된 값을 지우면 설정된다

git rm -r --cached . git add . git commit -m "delete cached"

Remote config

1. git remote add    

- git remote identifier is origin

2. git push

2_1. transmission from master

 -u

local branch's upstream will be set up as a origin(remote)'s master branch

so when you execute a pull command, you can get a master branch on the remote repository

2_2. transmission from others

3. git clone

3_1. To get a remote repository

3_2. remote's branch feature-D How to checkout

- git checkout -b feature-D

(Create a branch's feature-D)

- origin/feature-D

(reference to remote branch's feature-D)

3_3 Commit as a feature_D

3_4 To push to feature-D

3_5. git pull

commit control

1. git reset

- restoration

1_1. To restore a feature-A

- I will restore that point and make a other branch fix-B

- after

1_2. To make a fix-B branch

1_3. git goes back to several times

- git reflog

- I can check a specific status of commit

- after

2. To solve a conflict problem

- There is a conflict issue

2_1. Confirm a README.md

- vi README.md

- HEAD : current content

- fix-B : it will be merged

2_2. commit

3. Modify commit message

- git commit --amend

3_1. Before

3_2. after

4. Handle the process that changed

- git rebase -i

4_1. Example

- There would be a spelling error about commit before Topic branch merge with master

in this case, we fix a commit and then overwrite the before commit

because spelling error is not important

4_2. Making branch feature-C

- I make a spelling error on purpose(README.md)

- If you want to commit quickly, follow the way

4_3. fix a spelling error

4_4. handle a process changed(Use the rebase)

- I have two commits, "Add feature-C" and "Fix typo"

  which means I had a mistake so I changed my source 

  I want to arrange these logs

- rebase

- I put 6748345 into a591862 

- confirm

- There is no Fix typo

Create a branch

1. Why do we use branches?

- We can handle many problems (to fix bugs, add a function etc..) at the same time

2.  git branch

- (*) is a current branch

3. git checkout -b

- Create and change

3_1. To create a feature-A branch

- Same way

git branch feature-A (Create)

git checkout feature-A (Move to feature-A from master)    

- commit as a feature-A

3_2. Change branch to master

- git checkout master

- git checkout -

4. Topic branch

- For example feature-A branch topic is about adding a new function

- One branch has a one topic

5. Merge branch

- Usually, Master branch is merge branch

5_1. git merge

6. git log --graph

- Check branches visually