Git Version Control System

  1. Rewriting History
    1. The Dangers of Rewriting Public History
      1. When to Avoid Rewriting
        1. Shared Repositories
          1. Collaboration Impact
            1. Published Commits
            2. Safe Practices
              1. Local History Editing
                1. Communication Protocols
                  1. Backup Strategies
                2. Interactive Rebasing
                  1. Launching Interactive Rebase
                    1. Commit Range Selection
                      1. Editor Interface
                        1. Command Options
                        2. Changing Commit Messages
                          1. Message Editing
                            1. Reword Operations
                              1. Message Improvement
                              2. Reordering Commits
                                1. Commit Sequence Changes
                                  1. Logical Reorganization
                                    1. History Restructuring
                                    2. Squashing Commits
                                      1. Commit Combination
                                        1. Message Consolidation
                                          1. History Simplification
                                          2. Splitting a Commit
                                            1. Commit Decomposition
                                              1. Change Separation
                                                1. Granular History
                                                2. Dropping Commits
                                                  1. Commit Removal
                                                    1. History Editing
                                                      1. Change Elimination
                                                      2. Fixup Commits
                                                        1. Automatic Squashing
                                                          1. Commit Correction
                                                            1. Streamlined Workflow
                                                          2. Standard Rebasing
                                                            1. Rebasing Local Branches
                                                              1. Branch Base Changes
                                                                1. Linear History Creation
                                                                  1. Conflict Resolution
                                                                  2. Rebasing vs Merging
                                                                    1. History Differences
                                                                      1. Workflow Implications
                                                                        1. Team Preferences
                                                                        2. Resolving Conflicts During Rebase
                                                                          1. Conflict Identification
                                                                            1. Resolution Process
                                                                              1. Continuation Steps
                                                                              2. Aborting a Rebase
                                                                                1. Rebase Cancellation
                                                                                  1. State Restoration
                                                                                    1. Cleanup Operations
                                                                                    2. Continuing a Rebase
                                                                                      1. Conflict Resolution
                                                                                        1. Process Resumption
                                                                                          1. Completion Steps

                                                                                      Previous

                                                                                      9. Advanced Git Tools

                                                                                      Go to top

                                                                                      Next

                                                                                      11. Inspecting and Comparing