Please enable JavaScript.

Coggle requires JavaScript to display documents.

Git (Tools (git blame (-L <start>,<end>:<file>), git mv …

- - - - --soft -> history
      - --mixed -> staging + history
      - --hard -> working + staging + history
- - - - <repo>/.git/config -> --local
      - ~/.gitconfig -> --global
      - $(prefix)/etc/gitconfig -> --system
  - - - Bare Repository
        
        no working directory
        
        can't edit files/commit changes
        
        can push/pull
        
        the central repository should be bare
  - - - refs/remotes/origin
      - remote.origin.url
      - remote.origin.fetch
- - - - staged changes
        
        unstaged changes
      - -u : also stash your untracked files
      - -a : include changes to ignored files
    - - view a summary of a stash
      - -p : view the full diff of a stash
- - - - --oneline
      - --stat
      - -p
    - - -n <limit>
      - --author="<pattern>"text
      - --grep="<pattern>"
      - git log <since>..<until>
      - git log <file>
      - --after / --before
      - -L <start>,<end>:<file>
- - - - use an interactive rebasing session
      - can be used to reorder commits: git rebase -i head~n
- - - - -v : show sha1 and commit subject line
        -vv : also show upstream branch
      - --list (default) : list local branches
      - -a : list both local and remote branches
      - -r : list remote-tracking branches
    - - -d : delete a branch
      - -D : shortcut for --delete --force
    - - -u/--set-upstream-to : set up upstream
      - --unset-unstream : remove upstream
    - - git branch <branch>
    - - git branch -m <branch>
  - - - --no-ff -> no fast-forward
      - git merge <from-branch> <to-branch>
    - - Staging Area
      - 3-way merge