Git - Revision history

Jfreier at 16:34, 28 April 2026

2026-04-28T16:34:13Z

Jfreier at 16:33, 28 April 2026

2026-04-28T16:33:50Z

Jfreier at 16:33, 28 April 2026

2026-04-28T16:33:35Z

Jfreier at 20:12, 1 March 2024

2024-03-01T20:12:29Z

Jfreier at 19:55, 28 February 2024

2024-02-28T19:55:13Z

Jfreier at 16:03, 3 June 2020

2020-06-03T16:03:48Z

Jfreier: /* Rebase */

2020-06-03T16:00:37Z

‎Rebase

Jfreier at 20:47, 6 May 2020

2020-05-06T20:47:55Z

Jfreier at 20:47, 6 May 2020

2020-05-06T20:47:13Z

Jfreier: Created page with " == Rebase == When you are on a branch, you get git rebase master == Squash feature branch == This squashes all the commits in to one. git merge --squash feature and..."

2020-05-06T19:54:26Z

Created page with " == Rebase == When you are on a branch, you get git rebase master == Squash feature branch == This squashes all the commits in to one. git merge --squash feature and..."

New page

== Rebase ==
When you are on a branch, you get
git rebase master

== Squash feature branch ==
This squashes all the commits in to one.
git merge --squash feature

and then you need to commit the new squashed changes.
get commit -m "squashed changes merged in."

@@ Line 46: / Line 46: @@
-==Sign with GPG
+== Sign with GPG ==
 List your keys
    gpg --list-secret-keys --keyid-format=long
@@ Line 57: / Line 57: @@
    git config --global commit.gpgsign true
-==Stash
+== Stash ==
 Add a name to your stash.
    git stash push -m "your_custom_name"

@@ Line 46: / Line 46: @@
-== Sign with GPG
+==Sign with GPG
 List your keys
    gpg --list-secret-keys --keyid-format=long
@@ Line 57: / Line 57: @@
    git config --global commit.gpgsign true
-== Stash
+==Stash
 Add a name to your stash.
    git stash push -m "your_custom_name"

← Older revision		Revision as of 16:33, 28 April 2026
Line 56:		Line 56:
	Sign all commits by default.		Sign all commits by default.
	git config --global commit.gpgsign true		git config --global commit.gpgsign true
		+
		+	== Stash
		+	Add a name to your stash.
		+	git stash push -m "your_custom_name"
		+
		+	List your stash.
		+	git stash list
		+
		+	Apply your stash.
		+	git stash apply stash^{/your_custom_name}
		+
		+	Apply and remove your stash
		+	git stash pop stash^{/your_custom_name}

← Older revision		Revision as of 20:12, 1 March 2024
Line 44:		Line 44:
	This will add all tracked changes for a file type.		This will add all tracked changes for a file type.
	git ls-files \| grep ".md" \| xargs git add		git ls-files \| grep ".md" \| xargs git add
		+
		+
		+	== Sign with GPG
		+	List your keys
		+	gpg --list-secret-keys --keyid-format=long
		+
		+
		+	Update git to use a specific key.
		+	git config --global user.signingkey 3AA5C34371567BD2
		+
		+	Sign all commits by default.
		+	git config --global commit.gpgsign true

← Older revision		Revision as of 19:55, 28 February 2024
Line 35:		Line 35:
	A another way to view the logs.		A another way to view the logs.
	git log --oneline --decorate --graph --all		git log --oneline --decorate --graph --all
		+
		+
		+	== Add all untracked changes. ==
		+	Here is a couple of commands to help with backing things up.
		+	This will add all untracked changes for a file type.
		+	git ls-files --other \| grep ".md" \| xargs git add
		+
		+	This will add all tracked changes for a file type.
		+	git ls-files \| grep ".md" \| xargs git add

@@ Line 10: / Line 10: @@
    git push --force origin feature_branch
-With force with lease, it will git will warm you if anyone else has committed any code, this helps to prevent overwriting someones code.
+With force with lease, git will warn you if anyone else has committed any code, this helps to prevent overwriting someones code.
    git push --force-with-lease

@@ Line 2: / Line 2: @@
 == Rebase ==
 When you are on a branch, you get
    git rebase master
 == Squash feature branch ==

← Older revision		Revision as of 20:47, 6 May 2020
Line 16:		Line 16:
	git reset --soft HEAD~3		git reset --soft HEAD~3
	git commit -m 'new commit message'		git commit -m 'new commit message'
		+
		+
		+	== View the logs ==
		+	A another way to view the logs.
		+	git log --oneline --decorate --graph --all

← Older revision		Revision as of 20:47, 6 May 2020
Line 11:		Line 11:
	and then you need to commit the new squashed changes.		and then you need to commit the new squashed changes.
	get commit -m "squashed changes merged in."		get commit -m "squashed changes merged in."
		+
		+	== Squash Commits ==
		+	This squashes the last 3 commits.
		+	git reset --soft HEAD~3
		+	git commit -m 'new commit message'