GitFAQ.org

Frequently asked questions for git and git workflows.

What is local history/shared history?

“Remote history” or “Shared History” is used to refer to history that is shared with others. “Local history” is used to refer to changes that have never been shared.

For the following commit history, “Shared History"and “Local History” boundaries are shown,

A-B-C-D-E                origin/master

A-B-C-D-E-F-G-H-I        origin/feature1

A-B-C-D-E-F-G-H-I-J-K-J  feature1 (local)
|       | |     | |   |
|       | |     | +-+-+
|       | |     |   |
|       | +--+--+   Local History
|       |    |
+---+---+  Shared History (branch)
    |
Shared History (master)

Share

About

This FAQ is brought to you by Candle.

  1. How do I add only a portion of a file?
  2. How do I change my last commit message?
  3. How do I change the contents of a commit I have not pushed?
  4. How do I commit a file?
  5. How do I compare branches?
  6. How do I completely reset my local repository?
  7. How do I create a branch?
  8. How do I create a new git repository?
  9. How do I delete a branch?
  10. How do I get a list of files that have changed since a commit?
  11. How do I ignore a file pattern?
  12. How do I push my changes?
  13. How do I remove all untracked files?
  14. How do I revert all uncommitted changes?
  15. How do I squash commits?
  16. How do I undo a commit?
  17. How do I undo git add?
  18. How do I update my repository?
  19. What does “Changing History” mean?
  20. What if I forgot to add a file in my last commit?
  21. What is “origin”?
  22. What is a “detached head”?
  23. What is a “remote”?
  24. What is difference between master & HEAD?
  25. What is local history/shared history?
  26. What is rebasing?
  27. What is squashing?
  28. What is the difference between fetch and pull?

Links

  1. Made by Candle