Please enable JavaScript.

Coggle requires JavaScript to display documents.

vcs, GIT, manual vcs, GIT UNDERSTANDING, Does it store who.e file, GIT -…

- - - - To keep note of who made
      - In order to check config use got config -l command
  - - - can store a commit message
- - - - Status
        
        Modified
        
        Staged
        
        Why we stage and not directly commit
        
        In front of camera or the stage or the
        
        How to stage after editing
        
        Run git add command
        
        Were are we adding edits
        
        To the list of changes to be committed
        
        use the git add -p to see the changes and then decide whether to commit or not
        
        can you unstage a staged change
        
        use git reset namefile
        
        DOUBT WILL IT UNDO CHANGE IN THE MODIFIED FILE AND MAKE IT SAME AS THE FILE IN THE LAST COMMIT ???
        
        NO
        
        VS git restore --staged namefile
        
        Commited
        
        Snapshot
        
        git commit -m " commit message"
        
        Commit messages
        
        Think about what info might be useful for you or someone else weeks or months later
        
        Guidelines
        
        First line about the headline or short summary of the commit
        
        Followed by detailed description
        
        1 more item...
        
        50 chars
        
        Don't do the easy one word commit
        
        Not useful
        
        How can see them later
        
        Git log command
        
        Display author date and message
        
        get more info git log -p
        
        p stand for the patch
        
        output similar to diff -u
        
        alternatively if we want the changes shown only for one commit we can use git show COMMITID
        
        git log --stat command gives the statistics about the changes
        
        directly commit without staging if the files are already tracked
        
        use git commit -a
        
        modify the recent commit and its message if necssary
        
        use git commit --amend
        
        caution it deletes the history of last commit and overwrites it so dont use on a commit that has been piublic
        
        use only for local repp WHY DOUBT
        
        HOW YOU ROLLBACK TO A PREVOIUS COMMIT
        
        USE GIT REVERT COMMAND
        
        IT SIMPLY CREATES NEW COMMIT DOING THE OPPOSITE OF WHAT WAS DONE IN THE PREVIOUS COMMIT
        
        WITH A REVERT MESSAGE
        
        git revert
        
        revert a particulatr commit by making a new recommit
        
        use commit id
        
        or we could if only to revert the last commit then we could have used HEAD
        
        commit ID
        
        GENERATED BY HASING ALGORITHM SHA1
        
        GIVES A 40 CHACRTER RESULT
        
        MAKE SURE THAT DATA IS SAFE
    - - How to convert to tracked
        
        Run git add nameoffile
        
        Note it directly moves it to staging area
  - - - then git commit command
  - - - then commit
  - - - branch
        
        remote
        
        local
        
        point to commits
        
        create a new branch
        
        and checkout also
        
        git checkout -b nameofbranch
        
        git branch nameofthebranch
        
        why branches
        
        do work on new feature
        
        lets you to allow to leave the new feature and work on something important without the need to lose work or to complete the new feature and integrate first
        
        so that beta version different from the stable version
        
        so that we can take views of others before integrating into main project or branch
- - - - rember it doesnt work for staged files
        
        for this we need a flag--staged with diff command
  - - - but then what if i want to revert changes from a staged file
      - what if we only want to rvert some changes not all
        
        use -p flag
- - - - has local branchez
        
        green color
    - - origin
        
        DOUBT
        
        can we change the name of the remote repo
        
        is it the same as the repo name on git hub
        
        or it is just an alias for the remote branch
        
        NOW THIS HAS REMOTE BRANCHES
        
        red color
    - - may be when the person clones the whole repo
        
        then the branch checked out will be the one to which origin head points
        
        means after cloning he will be automnatically be in that branch
    - - this will get any new data from the remote repo into the local repo
        
        including new branches
        
        whcih wrere not there when we had clones
        
        old branch updated
        
        then we now have to merge any new commits to are local repos same branch
        
        CAN WE MERGE CHANGES INTO SOMEOTHER LOCAL BRANCH DIFFRENT FROM THE ONE
    - - WE ARE IN CURRENTLY A LOCAL BRANCH THAT WAS ALREADY PRESENT WHENM WE CLONERS THE REPO
        
        NOW IF WE RUN GIT PULL
        
        THEN ANY CHANGES MAD ETO THIS REMOTE BRANCH CORRESPONDING TO THIS LOCAL BRANCH WILL BE TRIED TO BE DIRECTLY MERGED
      - GIT FETCH + GIT MERGE
        
        BUT MERGE ONLY INTO THE LOCAL REPOS THAT WE HAD GOT WHEN WE HAD CLONES
        
        IF ANY NEW BRANCHES WHERE ADDED TO THE REMOTE REPO WE WILL BY THE FETCH GET THEM BUT WE WONT HAVE A LOCAL BRANCH CREATED CORRESPONFDING TO TRHAT NEW RENMOTE BRANCH
        
        WE WILL NEED TO DO IT MANNUALLY
        
        BY CHECKING OUT WITH THAT NEW BRANCHES NAME
    - - BUT LETS SAY HAVE CREATED A NEW LOCLA BRANCH AND NOW WANT TO SEND THAT TO REMOTE REPO
        
        THEN USE git push -u origin nameofthe branch
        
        u = upstream
        
        upstream another name for remote repo
  - - - DOUBT
  - - - WE CAN CLONE IT TO GET A LOCAL REPO ON OUR DEVICE
      - NOTE REMOTE BRANCHES
        
        MAY HAVE DIFFERENT FILES
        
        WHCIH MAY NOT BE ON MAIN BRANCH
        
        DOUBT DOES THAT MEAN SERVER HAS TWO DIFFERENT DIRECTOERIES HAVINF DIFFERENT FILES EVEN IF SOME ARE COMMON ??
  - - - WE WANT TO HAVE FAST FORWARD MERGE EVEN THOUGH THE BRANCH INTO WHICH WE WANTEDT O MERGE IS AHEAD OF WHAT IT WAS WHEN WE HAD CLONESD
        
        THIS IS DONE TO MAINTAIN LINEAR HISTORY
        
        DOUBT
        
        I THINK
        
        ONLY PROBLEM WHEN WE ARE LIKELY TO HAVE A THREE WAY MERGE
        
        IF MERGE DIRECTLY
        
        THEN ALL OUR COMMITS WILL BE GROUPED INTO A SINGLE COMMIT
        
        THEN WE MAY BE ONLY ABLE TO REMOVE ALL ARE COMMITS WHILE DEBUGGING NOT ONE BY ONE (ITHINK NOT SURE DOUBT)
      - GIT REBASE NAMEOFBRANCH
        
        IT WILL PUT THE CURRENT BRANCH ON TOP OF THE BRANCH WITH NAME = "NAMEOFTHEBRANCH"
      - CAN BE USED WHEN MERGING IN ONE BRANCH ALSO
  - - - directly from the git hub website
        
        simple
        
        edit
        
        forked
        
        automatically
        
        fork
        
        new branch create if some edit is done
        
        1 more item...
- - - - if yes what is a snapshot
- - - - why
        
        why not send the new file
        
        why not just text them the changes
      - use it to patch
        
        patch oldfile < oldfile.diff
        
        hint rember > into
        
        why it will not work always
      - command
        
        diff -u oldfile newfile > oldfile..diff
        
        does the name of the diff file matter
        
        what if we dont used the u tag
    - - diff file1 file 2
      - diff -u file1 file2
- - - - NOW TWO PEOPLE CREATE TWO DIFFERENT VERSION 2
        
        AND WE WANT BOTH
    - - SO WE DONT WANT TO CHANGE THE PRESENT STABLE VERSION
      - ALSO IF WE WANT TO HAVE TO BETA VERSION
- - - - AUTHOR
      - DATE
    - - TO THE SNAPSHOT WHICH WAS ASSOCIATED WIT HTHE COMMIT
      - TO THE LAST COMMIT OBJECT JUST BEFOR THIS ONE