Differences

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

--- newdevs:git:commands [2021/06/10 12:07] – [Squash Commits] tmccanna
+++ newdevs:git:commands [2022/10/24 11:51] – [Rebase] tmccanna
@@ Line 57: / Line 57: @@
   - Open the git branch
-  - Type: git rebase origin/master --> rebases the current branch to master
+  - Type: git rebase -i origin/master --> rebases the current branch to master, the -i makes it interactive
   - If there are merge conflict errors, type: git status
   - Open the file with the problem in your preferred text editor (notepad++, vim, nano, etc.)
@@ Line 118: / Line 118: @@
   * '':w'' --> saves your work
   * '':wq'' --> saves & closes
+  * '':set number'' --> turns on line numbers
+  * ''?abc'' --> searches for occurrences of 'abc'