Git - Revision history

RobertBushman at 07:06, 30 April 2026

2026-04-30T07:06:33Z

← Older revision		Revision as of 07:06, 30 April 2026
Line 31:		Line 31:
	merge		merge
	<pre>		<pre>
			git checkout master
	git merge experiment/css-layout		git merge experiment/css-layout
			git push
	</pre>		</pre>
	</pre>		</pre>

RobertBushman: /* Branch */

2026-04-28T17:45:13Z

Branch

@@ Line 33: / Line 33: @@
 git merge experiment/css-layout
 </pre>
 </pre>

RobertBushman: /* Branch */

2026-04-28T17:37:26Z

Branch

← Older revision		Revision as of 17:37, 28 April 2026
Line 23:		Line 23:
	Revert		Revert
	<pre>		<pre>
	git checkout ~~main~~		git checkout master
	</pre>		</pre>
	diff		diff
	<pre>		<pre>
	git diff ~~main~~..experiment/css-layout		git diff master..experiment/css-layout
	</pre>		</pre>
	merge		merge
Line 34:		Line 34:
	</pre>		</pre>
	</pre>		</pre>

	= Disable Autowreck =		= Disable Autowreck =
	<pre>		<pre>

RobertBushman at 17:33, 28 April 2026

2026-04-28T17:33:11Z

@@ Line 13: / Line 13: @@
 $ cd working-dir
 </pre>
+= Branch =
 = Disable Autowreck =
 <pre>

RobertBushman at 07:00, 28 April 2026

2026-04-28T07:00:42Z

@@ Line 1: / Line 1: @@
 [[Category:Hacking]]
 = Disable Autowreck =
 <pre>

RobertBushman: Created page with "Category:Hacking = Disable Autowreck =

 hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint:  hint:   git config pull.rebase false  # merge (the default strategy) hint:   git config pull.rebase true   # rebase hint:   git config pull.ff only       # fast-forward only hint:  hint: You can replace "git config" with..."

2023-09-26T03:00:09Z

Created page with "Category:Hacking = Disable Autowreck = <pre> hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with..."

New page

[[Category:Hacking]]
= Disable Autowreck =
<pre>
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
</pre>