Skip to content

Instantly share code, notes, and snippets.

@0res7

0res7/git_rebase.md

Forked from ravibhure/git_rebase.md
Created January 6, 2024 04:41
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save 0res7/bca82443a05a573568263de27c6c8071 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save 0res7/bca82443a05a573568263de27c6c8071 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. @ravibhure ravibhure revised this gist Nov 21, 2016. 1 changed file with 15 additions and 8 deletions.
    23 changes: 15 additions & 8 deletions git_rebase.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,18 +1,25 @@
    ### Add the remote, call it "upstream":
    ### In your local clone of your forked repository, you can add the original GitHub repository as a "remote". ("Remotes" are like nicknames for the URLs of repositories - origin is one, for example.) Then you can fetch all the branches from that upstream repository, and rebase your work to continue working on the upstream version. In terms of commands that might look like:

    #### Add the remote, call it "upstream":

    ```git remote add upstream https://github.com/whoever/whatever.git```

    ### Fetch all the branches of that remote into remote-tracking branches,
    ### such as upstream/master:
    #### Fetch all the branches of that remote into remote-tracking branches, such as upstream/master:

    ```git fetch upstream```

    ### Make sure that you're on your master branch:
    #### Make sure that you're on your master branch:

    ```git checkout master```

    ### Rewrite your master branch so that any commits of yours that
    ### aren't already in upstream/master are replayed on top of that
    ### other branch:
    #### Rewrite your master branch so that any commits of yours that aren't already in upstream/master are replayed on top of that other branch:

    ```git rebase upstream/master```

    #### If you don't want to rewrite the history of your master branch, (for example because other people may have cloned it) then you should replace the last command with git merge upstream/master. However, for making further pull requests that are as clean as possible, it's probably better to rebase.

    #### If you've rebased your branch onto upstream/master you may need to force the push in order to push it to your own forked repository on GitHub. You'd do that with:

    ```git push -f origin master```

    ```git rebase upstream/master```
    #### You only need to use the -f the first time after you've rebased.
  2. @ravibhure ravibhure created this gist Nov 21, 2016.
    18 changes: 18 additions & 0 deletions git_rebase.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,18 @@
    ### Add the remote, call it "upstream":

    ```git remote add upstream https://github.com/whoever/whatever.git```

    ### Fetch all the branches of that remote into remote-tracking branches,
    ### such as upstream/master:

    ```git fetch upstream```

    ### Make sure that you're on your master branch:

    ```git checkout master```

    ### Rewrite your master branch so that any commits of yours that
    ### aren't already in upstream/master are replayed on top of that
    ### other branch:

    ```git rebase upstream/master```