Git - Revision history

Leaky: /* Merging a branch */

2021-05-13T09:19:02Z

‎Merging a branch

Leaky: /* Aliases */

2021-05-13T09:17:24Z

‎Aliases

Leaky: /* Graphical view of commits */

2018-10-02T11:30:50Z

‎Graphical view of commits

Leaky: /* Aliases */

2017-09-27T08:30:49Z

‎Aliases

Leaky: added alias for 'git lg'

2017-08-23T13:27:43Z

added alias for 'git lg'

Leaky: /* Storing the .git directory outside the work tree */ updating git

2017-02-24T15:17:39Z

‎Storing the .git directory outside the work tree: updating git

Leaky: /* Configuration of git */ push.default behaviour

2016-03-08T16:11:12Z

‎Configuration of git: push.default behaviour

Leaky: /* Configuration of git */

2016-03-08T16:04:20Z

‎Configuration of git

Leaky: /* Graphical view of commits */ added .git outside work tree

2016-03-08T09:40:07Z

‎Graphical view of commits: added .git outside work tree

Leaky: /* View creation dates of branches */

2015-07-14T20:52:49Z

‎View creation dates of branches

← Older revision		Revision as of 09:19, 13 May 2021
Line 82:		Line 82:

	git merge branchname		git merge branchname
		+
		+	== Rebasing a branch ==
		+
		+	To go from something like this, where master has extra commits compared to a branch
		+
		+	* c32182bc - (HEAD -> master) Some minor cleanup from the broken code branch (3 minutes ago)
		+	\| * e307a930 - (broken-do-not-use-991-993) WIP #991/#993 - broken (18 hours ago)
		+	\| * 213ae299 - WIP #991/#993 (18 hours ago)
		+	\| * c3c26b92 - WIP #991 - bulk editing (18 hours ago)
		+	\|/
		+	* e67628b3 - (origin/master, origin/HEAD) More code cleanup (18 hours ago)
		+
		+	to this where the branch has all the commits from master plus copies of it's own (the commit ids change in the process)
		+
		+	* 50de2cba - (HEAD -> broken-do-not-use-991-993) WIP #991/#993 - broken (19 seconds ago)
		+	* 8d3821db - WIP #991/#993 (3 minutes ago)
		+	* de390087 - WIP #991 - bulk editing (3 minutes ago)
		+	* c32182bc - (master) Some minor cleanup from the broken code branch (13 minutes ago)
		+	* e67628b3 - (origin/master, origin/HEAD) More code cleanup (18 hours ago)
		+
		+	use the following command:
		+
		+	git rebase master broken-do-not-use-991-993
		+
		+	Afterwards, you might want to switch back to the master branch as it'll leave you on the `broken-do-not-use-991-993` branch.

	== Deleting a merged branch ==		== Deleting a merged branch ==

@@ Line 224: / Line 224: @@
      lg = log --graph --abbrev-commit --date=relative --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
-Prevent accidental double (or more) git's from causing errors. e.g 'git git status' => 'git status'
+or if you're the only author in this repository, you can skip the author name at the end and use this instead:
   git config --global alias.git '!exec git'

← Older revision		Revision as of 11:30, 2 October 2018
Line 166:		Line 166:

	git log --graph --oneline		git log --graph --oneline
		+
		+	== Rewrite author of all commits ==
		+
		+	Committed an entire repository with the wrong email/name for the committer? Run the following to reset everything. '''Be careful!'''
		+
		+	git filter-branch -f --env-filter \
		+	"GIT_AUTHOR_NAME='Newname'; GIT_AUTHOR_EMAIL='newemail'; \
		+	GIT_COMMITTER_NAME='committed-name'; GIT_COMMITTER_EMAIL='committed-email';" HEAD
		+
		+	Output (for a repository with only 4 commits):
		+
		+	Rewrite e996a36094ba2a516dcf6bebc115f7ac25b2da6a (1/4) (0 seconds passed, remaining 0 predicted)
		+	Rewrite 511aef3d14e92dbc2847934cf6313fd328aaf33d (2/4) (0 seconds passed, remaining 0 predicted)
		+	Rewrite 0d6b36c9c27568161e4b4a47b2fdeefc98742379 (3/4) (0 seconds passed, remaining 0 predicted)
		+	Rewrite 65b29f4418d773704e7055399c55959e45953108 (4/4) (0 seconds passed, remaining 0 predicted)
		+	Ref 'refs/heads/master' was rewritten

	== Storing the .git directory outside the work tree ==		== Storing the .git directory outside the work tree ==

← Older revision		Revision as of 08:30, 27 September 2017
Line 207:		Line 207:
	[alias]		[alias]
	lg = log --graph --abbrev-commit --date=relative --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'		lg = log --graph --abbrev-commit --date=relative --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
		+
		+	Prevent accidental double (or more) git's from causing errors. e.g 'git git status' => 'git status'
		+
		+	git config --global alias.git '!exec git'
		+
		+	(or add this to your .gitconfig)
		+
		+	[alias]
		+	git = !exec git

← Older revision		Revision as of 13:27, 23 August 2017
Line 200:		Line 200:

	# yum remove git perl-Git		# yum remove git perl-Git
		+
		+	== Aliases ==
		+
		+	Edit ~/.gitconfig and add:
		+
		+	[alias]
		+	lg = log --graph --abbrev-commit --date=relative --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'

← Older revision		Revision as of 15:17, 24 February 2017
Line 188:		Line 188:

	Your current directory will be the working tree and git will use the repository at /path/to/repo.git. The init command will automatically set the core.worktree value as specified with the --git-dir parameter.		Your current directory will be the working tree and git will use the repository at /path/to/repo.git. The init command will automatically set the core.worktree value as specified with the --git-dir parameter.
		+
		+	== Updating git ==
		+
		+	To update CentOS7 to the latest version 2 git, use the IUS repository.
		+
		+	Get the package url from https://dl.iuscommunity.org/pub/ius/stable/CentOS/7/x86_64/repoview/git2u.html and use it in the following command:
		+
		+	# yum install https://dl.iuscommunity.org/pub/ius/stable/CentOS/7/x86_64/git2u-2.11.1-1.ius.centos7.x86_64.rpm
		+
		+	If you already have the default version of git installed, you'll need to remove it first with this command:
		+
		+	# yum remove git perl-Git

@@ Line 26: / Line 26: @@
   git config --global color.branch auto
   git config --global diff.renamelimit 40960
 If you prefer long lines to be wrapped within less, the following will fix this.

← Older revision		Revision as of 09:40, 8 March 2016
Line 153:		Line 153:

	git log --graph --oneline		git log --graph --oneline
		+
		+	== Storing the .git directory outside the work tree ==
		+
		+	* content copied from http://stackoverflow.com/questions/505467/can-i-store-the-git-folder-outside-the-files-i-want-tracked
		+
		+	You just need to ensure that the repository knows where the work tree is and vice versa.
		+
		+	To let the repository know where the work tree is, set the configuration value core.worktree. To let the work tree know where it's git directory is, add a file named .git (not a folder!) and add a line like
		+
		+	gitdir: /path/to/repo.git
		+
		+	Since git 1.7.5 the init command learned an extra option for this. You can initialize a new separate repository with
		+
		+	git --separate-git-dir /path/to/repo.git init
		+
		+	This will initialize the git repository in the separate directory and add the .git file in the current directory, which is the working directory of the new repository. (Note: tried on 1.8.3 and it didn't recognise the option)
		+
		+	Previously to 1.7.5 you had to use slightly different parameters and add the .git file yourself. To initialize a separate repository the following command links the work-tree with the repository:
		+
		+	git --git-dir=/path/to/repo.git --work-tree=. init && echo "gitdir: /path/to/repo.git" > .git
		+
		+	Your current directory will be the working tree and git will use the repository at /path/to/repo.git. The init command will automatically set the core.worktree value as specified with the --git-dir parameter.

@@ Line 112: / Line 112: @@
 == View creation dates of branches ==
-  git for-each-ref --sort='-authordate:iso8601' --format=' %(authordate:iso8601)%09%(refname)' refs/heads
+  git for-each-ref --sort='-authordate:iso8601' \
 == Add specific lines ==