기본 콘텐츠로 건너뛰기

Git fetch, pull, merge and reset

GIT FETCH
- downloads commits, files, and refs(contents) from a remote repository into your local repo. Fetching is what you do when you want to see what everybody else has been working on.
... but it doesn't force you to actually merge the changes into your repo. Git isolates fetched content as a from existing local content, it has absolutely no effect on your local development work.Fetched content has to be explicitly checked out using the git checkout command.
...it does not update your local repo's working state, leaving your current dwor intact

GIT PULL
- git pull is more aggressive alternative, it will download the remote content for the active local branch and immediately execute git merge to create a merge commit for the new remote content.

GIT MERGE
- git merge is used to combine two branches. ...Once git finds a common base commit it will create a new "merge commit" that combines the changes of each queued merge commit sequence.
-preparing to merge
1. Confirm the receiving branch
2. Fetch latest remote commits / or pull to update local changes
3.merging...
 --git merge <branch name>

GIT RESET
-git reset will move the HEAD ref pointer and the current branch ref pointer.
 the default invocation of git reset has implicit arguments of --mixed and HEAD.
--hard
  the commit history ref pointers are updated to the specified commit. then the staging index and working directory are reset to match that of the specified commit.
--mixed
  the ref pointers are updated. the staging index is reset to the state of the specified commit. any changes that have been undone from the staging index are moved to the working directory.
--soft
  the ref pointers are updated and the reset stops there. The staging index and the working directory are left untouched.
라벨:

댓글

댓글 쓰기

이 블로그의 인기 게시물

JS 5.5 task6 Create an extendable calculator

<HTML>   <body>   </body>   <script> function Calculator() {   let methods = {     "-" : (a, b) => a - b,     "+" : (a, b) => a + b   };   //methods is an object which keeps key for operators   //and value to return the actual operation values   //each returns the result of operation that key(operator) does   this.calculate = function (str){     //calculate is one element in the function Calculator     //it takes the string and returns the value     //in the function element list is delimeted by , not ;     let split = str.split(" "),     a = +split[0],     op = split[1],     b = split [2]     if(!methods[op] || isNaN(a) || isNaN(b)) {       return NaN; // error handling     }     return methods[op](a,b);   }   this.addMethod = function(name, func){     methods[name] = func;     //this is how to add new key and ele to object   } } let powerCalc = new Calculator; powerCalc.addMethod("*&
댓글 쓰기
자세한 내용 보기

JS 5.7 task5 Store read dates

<HTML>   <body>   </body>    <script>    let messages = [        {text: "Hello", from: "John"},        {text: "How goes?", from: "John"},        {text: "See you soon", from: "Alice"}    ];    let readMap = new WeakMap();    alert(readMap.size);    readMap.set(messages[0], new Date(2019, 3, 5));   </script> </HTML> <!-- task4 needed weakSet to save simply readmessage, this task needs to save THE TIME IT WAS READ along with the message itself the message out of the set or map means it hasn't been read I kinda feel good and bad at the same time to happen to read the solution but I do get to think more about the difference with tasks and be more available to understand the main contents so I think, its good? -->
댓글 쓰기
자세한 내용 보기

JS 6.6 task Sum with an arbitrary amount of brackets

<HTML>   <body>   </body>    <script>    function sum(a) {          let currentSum = a;          function f(b) {        currentSum += b;        return f;      }          f.toString = function() {        return currentSum;      };          return f;    }        alert( sum(1)(2) ); // 3    alert( sum(5)(-1)(2) ); // 6    alert( sum(6)(-1)(-2)(-3) ); // 0    alert( sum(0)(1)(2)(3)(4)(5) ); // 15     </script> </HTML> <!--    자세한 설명은 생략한다. 날씨 너무 좋으니까 좀 놀러나간다    근데 이해는 했으니까 괜찮음 ㅎ -->   
댓글 쓰기
자세한 내용 보기