wget --no-check-certificate -q https://raw.githubusercontent.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh && sudo bash gitflow-installer.sh install develop; rm gitflow-installer.sh
sudo apt install git-flow
git flow init
git push origin --all
git flow feature start pointless-comments
git push --set-upstream origin feature/pointless-comments
git flow feature finish pointless_comments
git push --set-upstream origin develop
git flow release start 1.0.1
git flow release finish 1.0.1
git push --set-upstream origin release/1.0.1
> git checkout master
> git push origin --all --follow-tags
> git log --pretty=format:"%h %an %ar - %s"
e530db3 Scrapbook Git Tutorial 9 minutes ago - [# 3] - Step 3 - Git A
dd
7e597ef Scrapbook Git Tutorial 13 minutes ago - Initial Commit
> git show 7e597ef
commit 7e597ef90f3f46fd7b68feaae6890636b8a52d28
Author: Scrapbook Git Tutorial <[email protected]>
Date: Mon Sep 18 12:17:50 2017 +0000
Initial Commit
diff --git a/committed.js b/committed.js
new file mode 100644
index 0000000..12e7e7c
--- /dev/null
+++ b/committed.js
@@ -0,0 +1 @@
+console.log("Committed File")
> git log --grep="#1234"
> git checkout -b new_branch
Switched to a new branch 'new_branch'
> git branch -va
master
* new_branch
> git checkout master
Switched to branch 'master'
> git merge new_branch
Updating 7719315..0241ec6
Fast-forward
new-file-6.txt | 1 +
staging.txt | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 new-file-6.txt
> git push origin master
Total 0 (delta 0), reused 0 (delta 0)
To /s/remote-project/1
* [new branch] master -> master
> git branch -d new_branch
Deleted branch new_branch (was 0241ec6).
> git branch -r
origin/master
> git checkout remotes/origin/master
Note: checking out 'remotes/origin/master'.
You are in 'detached HEAD' state. You can look around, make experimen
tal
changes and commit them, and you can discard any commits you make in
this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you
may
do so (now or later) by using -b with the checkout command again. Exa
mple:
git checkout -b new_branch_name
HEAD is now at 92d34d1... Fix for Bug #42
> git reset HEAD .
Unstaged changes after reset:
M staging.txt
> git reset --hard HEAD
HEAD is now at 843b9e2 New File
> git revert HEAD --no-edit
[master c51cb80] Revert "Commit To Revert"
1 file changed, 1 insertion(+), 1 deletion(-)
> git merge remotes/origin/master
Auto-merging staging.txt
CONFLICT (add/add): Merge conflict in staging.txt
Automatic merge failed; fix conflicts and then commit the result.
> cat staging.txt
<<<<<<< HEAD
Fixing Error, Let's Hope No-One Else Does
=======
Fixing Previous Error
>>>>>>> remotes/origin/master
> git checkout --theirs staging.txt
> git log --pretty=oneline --reverse new_branch
04f9ee31280e8eac0dce9c2429d1e9f04f893dc3 Readme File
ebc00f664c71e29651bd83c0de50f1b2f499c797 Initial commit, no items
56069f957e372c0acd31516cb98d71888c1ec104 Initial list
fa7f29afb2f376ce0a59bc86006068dce75b6592 Creating Second List
4ee69e6e85566b41b35bc8e3bc2f3ef58f67e8be Adding final items to the list
> git cherry-pick new_branch~1
git flow init
git push origin --all
git flow feature start pointless-comments
vim README.md
git add .
git commit -a
git status
git push --set-upstream origin feature/pointless-comments
vim README.md
git add .
git commit -a
git push --set-upstream origin feature/pointless-comments
vim README.md
git add .
git commit -a
git push --set-upstream origin feature/pointless-comments
vim README.md
git add .
git commit -a
git push --set-upstream origin feature/pointless-comments
git flow feature finish
git push --set-upstream origin develop
git flow release start 1.0.1