Please enable JavaScript.

Coggle requires JavaScript to display documents.

cs-git (git (stash (create a pointer to a state w/ uncommitted changes…

- - - - https://
      - git://
      - SSH
        
        user@server:<path to repo>
  - - - staging area
      - working tree
      - file
  - - - compare staging area to latest commit
  - - - show diff in editor
    - - stage all tracked files before commit
    - - provide commit message as CLI
  - - - remove from staging area (ie untrack)
  - - - useful when work not ready for commit and work needed on sthg else
    - - integrate stashed changes to working tree
    - - delete top of stack
    - - <=> apply + drop
  - - - create a local branch tracking remote
      - equivalent to : git checkout -b [branch] [remotename]/[branch]
  - - - push local branch currently checked out, and make it track the remote one
- - - - index of (checksum, blob)
    - - checksum indexed file
      - checksum computed when staged
  - - - create branch at commit pointed by tag and swith to it
    - - create branch before switching to it
    - - Point HEAD to <branch>
      - Restore working tree corresponding to commit
  - - - delete branch
      - fails if not merged
    - - rename branch
    - - Relative state of local/remote tracked branches
    - - create branch
- - - - checkout of a version (retrieved from DB)
    - - info about next commit's content
    - - metadata + object database
  - - - this version is stored in db
    - - marked to be captured as is in the next snapshot
    - - changes since last commited version
- - - - show state of pointers in <remote> repo
  - - - fetch + merge tracked branch
    - - create branch tracking a remote
- - - - 3-way merge
        
        merge commit
        
        based on best common ancestor
    - - conflicting files listed ad "unmerged", "both modified"
      - edit merge blocks by hand or with tool
      - git add to mark file as resolved
- - - - show diffs
    - - summary of changes
    - - changes involving <name>
    - - changes affecting <path>