Git - Revision history

T1t0 at 17:40, 16 September 2023

2023-09-16T17:40:47Z

← Older revision		Revision as of 17:40, 16 September 2023
Line 102:		Line 102:

	<pre>		<pre>
	~~fn_parse_git_branch~~() { type git &> /dev/null && ~~BRANCH~~=`git symbolic-ref --short HEAD 2>/dev/null` && echo -n " $~~BRANCH~~"; };		fn_ps1_parse_git_head() { type -t git &>/dev/null && git rev-parse --git-dir &>/dev/null && HEAD=`git symbolic-ref --short HEAD 2>/dev/null \|\| git describe --tags --exact-match --abbrev=0 2>/dev/null \|\| git rev-parse --short HEAD 2>/dev/null` && echo -n " $HEAD"; }
	PS1="\[\033[1;32m\][\[\033[0;31m\]\u\[\033[1;32m\]@\h \[\033[1;34m\]\W\[\033[00;35m\]\$(~~fn_parse_git_branch~~)\[\033[1;32m\]]\$(test `id -u` -eq 0 && echo \"#\[\033[0m\] \" \|\| echo \"$\[\033[0m\] \")";		PS1="\[\033[1;32m\][\[\033[0;31m\]\u\[\033[1;32m\]@\h \[\033[1;34m\]\W\[\033[00;35m\]\$(fn_ps1_parse_git_head)\[\033[1;32m\]]\$(test `id -u` -eq 0 && echo \"#\[\033[0m\] \" \|\| echo \"$\[\033[0m\] \")"
	</pre>		</pre>

T1t0: /* Rewriting History */

2023-08-25T01:30:16Z

Rewriting History

← Older revision		Revision as of 01:30, 25 August 2023
Line 161:		Line 161:
	git add YOUR_OLD_FILE.ext		git add YOUR_OLD_FILE.ext
	git commit -m "This is an ancient commit"		git commit -m "This is an ancient commit"
			</pre>

			=== git cherry pick equivalent for other repository and directory ===

			Pick a commit (or a range of commits) from anoter repository as a diff and apply to the current commit, optionally to a different path where the changed sources was moved in the new repository:

			<pre>
			git --git-dir=../OTHER_REPOSITORY/.git format-patch --stdout COMMIT_HASH^...COMMIT_HASH \| git am --directory='NEW_REPO_DIRECTORY/'
	</pre>		</pre>

T1t0: /* Rewriting History */

2022-08-12T01:38:52Z

Rewriting History

@@ Line 148: / Line 148: @@
 git update-ref -d refs/original/refs/heads/master
 git gc --prune=now
 </pre>

T1t0: /* Rewriting History */

2021-08-01T05:16:43Z

Rewriting History

← Older revision		Revision as of 05:16, 1 August 2021
Line 127:		Line 127:

	== Rewriting History ==		== Rewriting History ==

			=== Edit author ===

			<pre>
			git filter-branch --force --env-filter '
			if [ "$GIT_COMMITTER_EMAIL" = "OLD_AUTHOR@SERVER.com" ];
			then
			GIT_COMMITTER_NAME="NEW_AUTHOR";
			GIT_COMMITTER_EMAIL="NEW_AUTHOR@SERVER.org";
			GIT_AUTHOR_NAME="NEW_AUTHOR";
			GIT_AUTHOR_EMAIL="NEW_AUTHOR@SERVER.org";
			fi' -- --all
			</pre>

	=== Edit matching commit comments ===		=== Edit matching commit comments ===

T1t0: /* Configure default git behaviors */

2021-07-17T16:52:12Z

Configure default git behaviors

← Older revision		Revision as of 16:52, 17 July 2021
Line 68:		Line 68:
	[alias]		[alias]
	graph = log --all --graph --format=format:'%C(bold blue)%h%C(reset) %C(bold green)%ad%C(reset) %C(white)%s%C(reset) %C(dim white)[%an]%C(reset)%C(bold yellow)%d%C(reset)'		graph = log --all --graph --format=format:'%C(bold blue)%h%C(reset) %C(bold green)%ad%C(reset) %C(white)%s%C(reset) %C(dim white)[%an]%C(reset)%C(bold yellow)%d%C(reset)'
			purge = !"du -hs .git && rm -rf .git/refs/original && rm -rf .git/logs && git reflog expire --expire=now --all && git gc --aggressive --prune=now && du -hs .git #"
	scm = !"test -z \"$1\" -o -z \"$2\" -o ! -z \"$4\" && echo 1>&2 \"Usage: git scm <feat\|fix\|docs\|style\|refactor> <'The subject'> ['An optional body']\" && exit 1 \|\| test -z \"$3\" && git commit -m \"$1: $2\" \|\| git commit -m \"$1: $2\" -m \"$3\" #"		scm = !"test -z \"$1\" -o -z \"$2\" -o ! -z \"$4\" && echo 1>&2 \"Usage: git scm <feat\|fix\|docs\|style\|refactor> <'The subject'> ['An optional body']\" && exit 1 \|\| test -z \"$3\" && git commit -m \"$1: $2\" \|\| git commit -m \"$1: $2\" -m \"$3\" #"
	~~purge~~ = ~~!"du~~ -~~hs .git && rm~~ -~~rf .git/refs/original && rm~~ -~~rf .git/logs && git reflog expire~~ --~~expire~~=~~now~~ --~~all &&~~ git gc --~~aggressive~~ --~~prune~~=~~now && du -hs .git~~ #"		difftool = difftool -M -C
			diffcached = difftool --cached -M -C
			taglist = tag --list --sort=-creatordate
			taglast = !"git describe --tags $(git rev-list --tags --max-count=1) #"
			[pull]
			ff = only
	[diff]		[diff]
	tool = diffuse		tool = diffuse
	[difftool]		[difftool]
	prompt = false		prompt = false
	~~[difftool "emacs"]~~
	~~cmd = emacs -nw --eval \"(progn (setq vc-handled-backends ()) (ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\"))\"~~
	[merge]		[merge]
	tool = kdiff3		tool = kdiff3
	[mergetool]		[mergetool]
	prompt = false		prompt = false
			[difftool "emacs"]
			cmd = emacs --eval \"(progn (setq-default vc-handled-backends ()) \
			(let ((local \\\"$LOCAL\\\") (remote \\\"$REMOTE\\\") (merged \\\"$MERGED\\\")) \
			(cond ((string= local null-device) (find-file remote) (warn \\\"local file '%s' is new\\\" merged)) \
			((string= remote null-device) (find-file local) (warn \\\"remote file '%s' was removed\\\" merged)) \
			(t (ediff-files local remote)))))\"
	[mergetool "emacs"]		[mergetool "emacs"]
	cmd = emacs ~~-nw~~ --eval \"(progn (setq vc-handled-backends ()) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"		cmd = emacs --eval \"(progn (setq-default vc-handled-backends ()) \
			(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
	[mergetool "kdiff3"]		[mergetool "kdiff3"]
	cmd = kdiff3 --qall --L1 \"$MERGED (Base)\" --L2 \"$MERGED (Local)\" --L3 \"$MERGED (Remote)\" -o \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"		cmd = kdiff3 --qall --L1 \"$MERGED (Base)\" --L2 \"$MERGED (Local)\" --L3 \"$MERGED (Remote)\" -o \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"

T1t0: /* Usage */

2020-10-19T20:24:42Z

Usage

← Older revision		Revision as of 20:24, 19 October 2020
Line 116:		Line 116:

	== Rewriting History ==		== Rewriting History ==

			=== Edit matching commit comments ===

			<pre>
			git filter-branch -f --msg-filter 'sed "s/OLD_TEXT/NEW_TEXT/g"
			git push -f
			git update-ref -d refs/original/refs/heads/master
			git gc --prune=now
			</pre>

	=== Find files to remove ===		=== Find files to remove ===

T1t0: /* References */

2019-04-28T18:41:14Z

References

← Older revision		Revision as of 18:41, 28 April 2019
Line 189:		Line 189:
	</pre>		</pre>

	== References ==		=== References ===

	* http://blog.ostermiller.org/git-remove-from-history		* http://blog.ostermiller.org/git-remove-from-history

T1t0 at 18:40, 28 April 2019

2019-04-28T18:40:34Z

← Older revision		Revision as of 18:40, 28 April 2019
Line 32:		Line 32:
	= Command line =		= Command line =

	= Graphic diff and merge editors =		== Graphic diff and merge editors ==

	* [http://diffuse.sourceforge.net/ graphical tool for merging and comparing text files]		* [http://diffuse.sourceforge.net/ graphical tool for merging and comparing text files]
Line 40:		Line 40:
	<pre>apt-get install kdiff3-qt</pre>		<pre>apt-get install kdiff3-qt</pre>

	= A colored git log with merge graph =		== A colored git log with merge graph ==

	<pre>		<pre>
Line 46:		Line 46:
	</pre>		</pre>

	= Configure default git behaviors =		== Configure default git behaviors ==

	* Edit ~/.gitconfig		* Edit ~/.gitconfig
Line 86:		Line 86:
	</pre>		</pre>

	= Configure shell to display current branch in PS1 =		== Configure shell to display current branch in PS1 ==

	* Add the follow instruction in your .bashrc or .profile		* Add the follow instruction in your .bashrc or .profile
Line 95:		Line 95:
	</pre>		</pre>

	= Get a range of commits and apply to a specific repository/branch =		= Usage =

			== Semantic Commit Message ==

			* from https://seesparkbox.com/foundry/semantic_commit_messages

			Note: to help with this convention, a git alias "git scm" is configured in the config file shown above.

			== Get a range of commits and apply to a specific repository/branch ==

	<pre>		<pre>
Line 107:		Line 115:
	</pre>		</pre>

	= Rewriting History =		== Rewriting History ==

	== Find files to remove ==		=== Find files to remove ===

	* By name		* By name
Line 127:		Line 135:
	</pre>		</pre>

	== Remove a file ==		=== Remove a file ===

	<pre>		<pre>
Line 157:		Line 165:
	</pre>		</pre>

	== Example: forced history clean from big deleted files ==		=== Example: forced history clean from big deleted files ===

	<pre>		<pre>

T1t0: /* Configure default git behaviors */

2019-04-28T18:33:42Z

Configure default git behaviors

← Older revision		Revision as of 18:33, 28 April 2019
Line 67:		Line 67:
	ui = true		ui = true
	[alias]		[alias]
	graph = log --graph --format=format:'%C(bold blue)%h%C(reset) %C(bold green)%ad%C(reset) %C(white)%s%C(reset) %C(dim white)[%an]%C(reset)%C(bold yellow)%d%C(reset)'		graph = log --all --graph --format=format:'%C(bold blue)%h%C(reset) %C(bold green)%ad%C(reset) %C(white)%s%C(reset) %C(dim white)[%an]%C(reset)%C(bold yellow)%d%C(reset)'
			scm = !"test -z \"$1\" -o -z \"$2\" -o ! -z \"$4\" && echo 1>&2 \"Usage: git scm <feat\|fix\|docs\|style\|refactor> <'The subject'> ['An optional body']\" && exit 1 \|\| test -z \"$3\" && git commit -m \"$1: $2\" \|\| git commit -m \"$1: $2\" -m \"$3\" #"
			purge = !"du -hs .git && rm -rf .git/refs/original && rm -rf .git/logs && git reflog expire --expire=now --all && git gc --aggressive --prune=now && du -hs .git #"
	[diff]		[diff]
	tool = diffuse		tool = diffuse

imported>T1t0: /* Configure default git behaviors */

2018-11-11T22:51:41Z

Configure default git behaviors

← Older revision		Revision as of 22:51, 11 November 2018
Line 51:		Line 51:

	<pre>		<pre>
	~~[color]~~
	~~branch = auto~~
	~~diff = auto~~
	~~status = auto~~
	~~showbranch = auto~~
	~~ui = true~~
	[core]		[core]
	editor = nano		editor = nano
Line 66:		Line 60:
	abbrevCommit = true		abbrevCommit = true
	date = short		date = short
			[color]
			branch = auto
			diff = auto
			status = auto
			showbranch = auto
			ui = true
	[alias]		[alias]
	graph = log --graph ~~--abbrev-commit --decorate~~ --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%~~ar)~~%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' ~~--all~~		graph = log --graph --format=format:'%C(bold blue)%h%C(reset) %C(bold green)%ad%C(reset) %C(white)%s%C(reset) %C(dim white)[%an]%C(reset)%C(bold yellow)%d%C(reset)'
	[diff]		[diff]
	tool = diffuse		tool = diffuse
	[difftool]		[difftool]
	prompt = false		prompt = false
			[difftool "emacs"]
			cmd = emacs -nw --eval \"(progn (setq vc-handled-backends ()) (ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\"))\"
	[merge]		[merge]
	tool = kdiff3		tool = kdiff3
	[mergetool]		[mergetool]
	prompt = false		prompt = false
			[mergetool "emacs"]
			cmd = emacs -nw --eval \"(progn (setq vc-handled-backends ()) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
			[mergetool "kdiff3"]
			cmd = kdiff3 --qall --L1 \"$MERGED (Base)\" --L2 \"$MERGED (Local)\" --L3 \"$MERGED (Remote)\" -o \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
	</pre>		</pre>