Differences

This shows you the differences between two versions of the page.

--- newdevs:git:commands [2021/05/28 11:46] – tmccanna
+++ newdevs:git:commands [2021/06/10 12:05] – [Squash Commits] tmccanna
@@ Line 40: / Line 40: @@
   * ''git push working <nowiki>--delete</nowiki> mybranchname'' --> delete a remote branch
   * ''git remote -v'' --> display remote directories
-  * ''git remote update'' -->
+  * ''git remote update'' --> refresh your local cache from the remote branches (does not download new branches); equivalent to git fetch --all
   * ''git reset HEAD myfile.txt'' --> unstage a file that has already been staged
   * ''git reset <nowiki>--hard</nowiki>'' --> reset a current branch to its original state
@@ Line 72: / Line 72: @@
   - Verify that you are in your local branch.
   - Type: git rebase -i origin/master
+    * Alternatively if your branch is already built on current master, you can enter: git rebase -i HEAD~4   (where 4 is the number of commits you wish to combine)
   - Your text editor will open and should show both of the commits, for example:
     * pick 014e59c579 LP#1839359 Select element on login not accessible