abbas-v1 · December 2, 2023 09:33 · Dec 2, 2023 · Jul 28, 2023 · Apr 1, 2022 · May 30, 2021
diff --git a/git-commands b/git-commands
@@ -128,6 +128,11 @@ git fetch --all
 Then is possible to merge another branch from the new remote to your current one.
 git merge template/main --allow-unrelated-histories
 
-Rebase your branch to current master branch
+Rebase your branch to master branch
 git rebase master
 git push --force origin your_branch_name
+
+If you have a branch A from master and then another branch B from A and want to connect B to master
+git checkout B
+git rebase A --onto master
+git push --force origin B
diff --git a/git-commands b/git-commands
@@ -126,4 +126,8 @@ Then run git fetch to update the changes
 git fetch --all
 
 Then is possible to merge another branch from the new remote to your current one.
-git merge template/main --allow-unrelated-histories
+git merge template/main --allow-unrelated-histories
+
+Rebase your branch to current master branch
+git rebase master
+git push --force origin your_branch_name
diff --git a/git-commands b/git-commands
@@ -15,6 +15,7 @@ git branch -a
 
 List all tags
 ```
+
 git tag -l
 ```
 
@@ -114,4 +115,15 @@ for commit in $(git log --reverse --pretty=%H --since="2021-05-27T17:19:00" --un
 do
    git cherry-pick $commit
 done   
-```
+```
+
+Get changes from GitHub template
+
+On the other repositories you have to add this template repository as a remote.
+git remote add template https://github.com/bit-oasis/template-service.git
+
+Then run git fetch to update the changes
+git fetch --all
+
+Then is possible to merge another branch from the new remote to your current one.
+git merge template/main --allow-unrelated-histories
diff --git a/git-commands b/git-commands
@@ -106,4 +106,12 @@ git clean -f -d
 Files changed in this branch
 ```
 git diff master.. --name-only
+```
+
+Cherry-pick commits from one branch into another
+```
+for commit in $(git log --reverse --pretty=%H --since="2021-05-27T17:19:00" --until="2021-05-30T12:03:00" --all);
+do
+   git cherry-pick $commit
+done   
 ```
diff --git a/git-commands b/git-commands
@@ -92,13 +92,13 @@ Reset local branch to previous commit
 git reset --hard e3f1e37
 ```
 
-Reset remote branch to previous commit
+Hard reset remote branch to previous commit
 ```
 git reset --hard e3f1e37
 git push --force origin develop
 ```
 
-Reset to clean untracked files and directories
+Hard reset to clean untracked files and directories
 ```
 git clean -f -d
 ```

diff --git a/git-commands b/git-commands
@@ -87,6 +87,17 @@ Completely undo it, throwing away all uncommitted changes, resetting everything
 git reset --hard HEAD^
 ```
 
+Reset local branch to previous commit
+```
+git reset --hard e3f1e37
+```
+
+Reset remote branch to previous commit
+```
+git reset --hard e3f1e37
+git push --force origin develop
+```
+
 Reset to clean untracked files and directories
 ```
 git clean -f -d

diff --git a/git-commands.md → git-commands b/git-commands.md → git-commands
diff --git a/git-commands.md b/git-commands.md
@@ -87,6 +87,11 @@ Completely undo it, throwing away all uncommitted changes, resetting everything
 git reset --hard HEAD^
 ```
 
+Reset to clean untracked files and directories
+```
+git clean -f -d
+```
+
 Files changed in this branch
 ```
 git diff master.. --name-only

diff --git a/git-commands.md b/git-commands.md
@@ -85,4 +85,9 @@ git reset HEAD^
 Completely undo it, throwing away all uncommitted changes, resetting everything to the previous commit
 ```
 git reset --hard HEAD^
+```
+
+Files changed in this branch
+```
+git diff master.. --name-only
 ```
diff --git a/git-commands.md b/git-commands.md
@@ -18,11 +18,13 @@ List all tags
 git tag -l
 ```
 
-Checkout a specific branch, tag or revision
+Checkout a specific branch, tag, revision, file or a directory
 ```
 git checkout <branch_name>
 git checkout tags/<tag_name>
 git checkout <revision_sha>
+git checkout origin/master -- <filename>
+git checkout origin/master -- </directory/path/>
 ```
 
 Stashing changes

diff --git a/git-commands.md b/git-commands.md
@@ -58,6 +58,18 @@ Resolve merge conflicts
 git mergetool
 ```
 
+If already in conflict state, and want to accept all of theirs
+```
+git checkout --theirs .
+git add .
+```
+
+If already in conflict state, and want to accept all of ours
+```
+git checkout --ours .
+git add .
+```
+
 Undo the act of committing, leaving everything else intact
 ```
 git reset --soft HEAD^

diff --git a/git-commands.md b/git-commands.md
@@ -71,9 +71,4 @@ git reset HEAD^
 Completely undo it, throwing away all uncommitted changes, resetting everything to the previous commit
 ```
 git reset --hard HEAD^
-```
-
-SVN difference
-```
-svn diff -r 13:17 > review.patch
 ```
diff --git a/git-commands.md b/git-commands.md
@@ -1,26 +1,8 @@
-# gitCommands
-
-Go to the directory **where** you want to clone the repo
-```
-git clone repository_URL
-```
-
-To ignore a tracked file
+Clone a remote repository on your local machine
 ```
-git update-index --assume-unchanged <file>
+git clone <repository_url>
 ```
 
-To start tracking changes again
-```
-git update-index --no-assume-unchanged <file>
-```
-
-To revert changes made in a previous commit
-```
-git revert dd61ab32
-```
-note: for a small message [ -m "sldfkjs dflskdifs" ] 
-
 List all local branches
 ```
 git branch
@@ -40,37 +22,53 @@ Checkout a specific branch, tag or revision
 ```
 git checkout <branch_name>
 git checkout tags/<tag_name>
-git checkout <sha_of_revision>
+git checkout <revision_sha>
 ```
 
-Show the change history of a file
+Stashing changes
 ```
-gitk [fileNamWithPath]
+git stash list
+git stash
+git stash pop
+git stash drop
 ```
 
-To merge conflicts. Commit your local changes without pushing and git a pull. Then
+Ignore changes in a file that is currently being tracked
 ```
-git mergetool
+git update-index --assume-unchanged <file_name>
 ```
 
-Stashing changes
+Start tracking changes in a file that has been previously ignored
 ```
-git stash list
-git stash
-git stash pop
+git update-index --no-assume-unchanged <filen_name>
+```
+
+Revert changes made in a previous commit
+```
+git revert <revision_sha>
+```
+
+Show change history of a file
+```
+gitk <file_path>
+```
+
+Resolve merge conflicts
+```
+git mergetool
 ```
 
-If all you want to do is undo the act of committing, leaving everything else intact, use:
+Undo the act of committing, leaving everything else intact
 ```
 git reset --soft HEAD^
 ```
 
-If you want to undo the act of committing and everything you'd staged, but leave the work tree (your files intact):
+Undo the act of committing and everything you'd staged, but leave the work tree (your files intact)
 ```
 git reset HEAD^
 ```
 
-If you actually want to completely undo it, throwing away all uncommitted changes, resetting everything to the previous commit (as the original question asked):
+Completely undo it, throwing away all uncommitted changes, resetting everything to the previous commit
 ```
 git reset --hard HEAD^
 ```

diff --git a/sdf.txt b/sdf.txt
@@ -1 +0,0 @@
-I like it **this** way.

diff --git a/git-commands → git-commands.md b/git-commands → git-commands.md
diff --git a/sdf.txt b/sdf.txt
@@ -0,0 +1 @@
+I like it **this** way.
diff --git a/git-commands b/git-commands
@@ -1,8 +1,8 @@
 # gitCommands
 
-Go to the directory where you want to clone the repo
+Go to the directory **where** you want to clone the repo
 ```
-'git **clone** repository_URL'
+git clone repository_URL
 ```
 
 To ignore a tracked file

diff --git a/git-commands b/git-commands
@@ -2,7 +2,7 @@
 
 Go to the directory where you want to clone the repo
 ```
-'git clone repository_URL'
+'git **clone** repository_URL'
 ```
 
 To ignore a tracked file

diff --git a/git-commands b/git-commands
@@ -2,7 +2,7 @@
 
 Go to the directory where you want to clone the repo
 ```
-git clone repository_URL
+'git clone repository_URL'
 ```
 
 To ignore a tracked file

diff --git a/git-commands b/git-commands
@@ -0,0 +1,81 @@
+# gitCommands
+
+Go to the directory where you want to clone the repo
+```
+git clone repository_URL
+```
+
+To ignore a tracked file
+```
+git update-index --assume-unchanged <file>
+```
+
+To start tracking changes again
+```
+git update-index --no-assume-unchanged <file>
+```
+
+To revert changes made in a previous commit
+```
+git revert dd61ab32
+```
+note: for a small message [ -m "sldfkjs dflskdifs" ] 
+
+List all local branches
+```
+git branch
+```
+
+List all local and remote branches
+```
+git branch -a
+```
+
+List all tags
+```
+git tag -l
+```
+
+Checkout a specific branch, tag or revision
+```
+git checkout <branch_name>
+git checkout tags/<tag_name>
+git checkout <sha_of_revision>
+```
+
+Show the change history of a file
+```
+gitk [fileNamWithPath]
+```
+
+To merge conflicts. Commit your local changes without pushing and git a pull. Then
+```
+git mergetool
+```
+
+Stashing changes
+```
+git stash list
+git stash
+git stash pop
+```
+
+If all you want to do is undo the act of committing, leaving everything else intact, use:
+```
+git reset --soft HEAD^
+```
+
+If you want to undo the act of committing and everything you'd staged, but leave the work tree (your files intact):
+```
+git reset HEAD^
+```
+
+If you actually want to completely undo it, throwing away all uncommitted changes, resetting everything to the previous commit (as the original question asked):
+```
+git reset --hard HEAD^
+```
+
+SVN difference
+```
+svn diff -r 13:17 > review.patch
+```
No results found