Git/Git - Revision history

Pio2pio: /* Git helper */

2022-10-31T14:18:46Z

Git helper

← Older revision		Revision as of 16:18, 31 October 2022
Line 74:		Line 74:
	On Windows systems, Git looks for the <code>.gitconfig</code> file in the <code>$HOME</code> aka <code>%profile%</code> directory <code>C:\Users\$USER</code> for most people. It also still looks for <code>/etc/gitconfig</code>, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. If you are using Git for Windows 2.x or later, there is also a system-level config file at <code>C:\ProgramData\Git\config</code>. This config file can only be changed by <code>git config -f <file></code> as an admin.		On Windows systems, Git looks for the <code>.gitconfig</code> file in the <code>$HOME</code> aka <code>%profile%</code> directory <code>C:\Users\$USER</code> for most people. It also still looks for <code>/etc/gitconfig</code>, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. If you are using Git for Windows 2.x or later, there is also a system-level config file at <code>C:\ProgramData\Git\config</code>. This config file can only be changed by <code>git config -f <file></code> as an admin.

	= Git helper =		= Credentials - Git helper =
	It's possible to call a script each time we need authentication. Ie. to automatically provide user and password we can create a script:		It's possible to call a script each time we need authentication. Ie. to automatically provide user and password we can create a script:
	<source lang=bash>		<source lang=bash>
Line 87:		Line 87:
	<source lang=bash>		<source lang=bash>
	git config --global credential.https://bitbucket.example.com.helper=~/.git/git_helper.sh		git config --global credential.https://bitbucket.example.com.helper=~/.git/git_helper.sh
			</source>


			Store credentials
			<source lang=bash>
			git config --global credential.helper store
			# creates plain text file `~/.git-credentials` where login+password are stored.
	</source>		</source>

Pio2pio: /* =Undo Last Commit with git revert */

2022-10-10T11:33:08Z

=Undo Last Commit with git revert

← Older revision		Revision as of 13:33, 10 October 2022
Line 499:		Line 499:
	</source>		</source>

	====Undo Last Commit with git revert===		====Undo Last Commit with git revert====
	In order to revert the last Git commit, use the “git revert” and specify the commit to be reverted which is “HEAD” for the last commit of your history.		In order to revert the last Git commit, use the “git revert” and specify the commit to be reverted which is “HEAD” for the last commit of your history.

Pio2pio: /* Undoing changes */

2022-10-10T11:32:57Z

Undoing changes

← Older revision		Revision as of 13:32, 10 October 2022
Line 497:		Line 497:
	<source lang=bash>		<source lang=bash>
	git commit --amend -m "New commit"		git commit --amend -m "New commit"
			</source>

			====Undo Last Commit with git revert===
			In order to revert the last Git commit, use the “git revert” and specify the commit to be reverted which is “HEAD” for the last commit of your history.

			The “git revert” command is slightly different from the “git reset” command because it will record a new commit with the changes introduced by reverting the last commit.
			<source lang=bash>
			git revert HEAD
	</source>		</source>

Pio2pio: /* Undo a failed merge */

2022-10-10T11:27:05Z

Undo a failed merge

← Older revision		Revision as of 13:27, 10 October 2022
Line 454:		Line 454:
	git merge --abort		git merge --abort

	=== Undo a failed merge ===		==== Undo a failed merge ====
	Option 1 - <code>git clean</code>		Option 1 - <code>git clean</code>
	<source lang=bash>		<source lang=bash>

Pio2pio: /* = In a local branch */

2022-10-10T11:26:36Z

= In a local branch

← Older revision		Revision as of 13:26, 10 October 2022
Line 443:		Line 443:

	=== Undoing changes ===		=== Undoing changes ===
	==== In a local branch ===		==== In a local branch ====
	===== Undo a merge that hasn't been pushed yet =====		===== Undo a merge that hasn't been pushed yet =====
	Make your local master branch look identical to origin/master. It is possible that origin/master may be ahead of your local master just previous to the merge by some commits, in that case this might not give the desired results		Make your local master branch look identical to origin/master. It is possible that origin/master may be ahead of your local master just previous to the merge by some commits, in that case this might not give the desired results

Pio2pio: /* Undoing changes in a local branch */

2022-10-10T11:26:26Z

Undoing changes in a local branch

← Older revision		Revision as of 13:26, 10 October 2022
Line 442:		Line 442:


	=== Undoing changes in a local branch ===		=== Undoing changes ===
	==== Undo a merge that hasn't been pushed yet ====		==== In a local branch ===
			===== Undo a merge that hasn't been pushed yet =====
	Make your local master branch look identical to origin/master. It is possible that origin/master may be ahead of your local master just previous to the merge by some commits, in that case this might not give the desired results		Make your local master branch look identical to origin/master. It is possible that origin/master may be ahead of your local master just previous to the merge by some commits, in that case this might not give the desired results
	(master)$ git reset --hard origin/master		(master)$ git reset --hard origin/master
Line 452:		Line 453:
	With newer Git versions, if you have not committed the merge yet and you have a merge conflict:		With newer Git versions, if you have not committed the merge yet and you have a merge conflict:
	git merge --abort		git merge --abort


	=== Undo a failed merge ===		=== Undo a failed merge ===

Pio2pio: /* Git settings */

2022-05-26T12:25:12Z

Git settings

← Older revision		Revision as of 14:25, 26 May 2022
Line 19:		Line 19:
	:Commands - are only relevant to directory that is tracked, it means it has .git/ tracking directory. Each time you use git commit changes are recorded in that directory.		:Commands - are only relevant to directory that is tracked, it means it has .git/ tracking directory. Each time you use git commit changes are recorded in that directory.

	~~= Git~~ settings =		settings =
	Specify your username and user email as these details are used each time you commit changes		Specify your username and user email as these details are used each time you commit changes
	<source lang=bash>		<source lang=bash>
Line 72:		Line 72:


	On Windows systems, Git looks for the <code>.gitconfig<code> file in the <code>$HOME</code> aka <code>%profile%</code> directory <code>C:\Users\$USER</code> for most people. It also still looks for <code>/etc/gitconfig</code>, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. If you are using Git for Windows 2.x or later, there is also a system-level config file at <code>C:\ProgramData\Git\config</code>. This config file can only be changed by <code>git config -f <file></code> as an admin.		On Windows systems, Git looks for the <code>.gitconfig</code> file in the <code>$HOME</code> aka <code>%profile%</code> directory <code>C:\Users\$USER</code> for most people. It also still looks for <code>/etc/gitconfig</code>, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. If you are using Git for Windows 2.x or later, there is also a system-level config file at <code>C:\ProgramData\Git\config</code>. This config file can only be changed by <code>git config -f <file></code> as an admin.

			= Git helper =
			It's possible to call a script each time we need authentication. Ie. to automatically provide user and password we can create a script:
			<source lang=bash>
			cat ~/.git/git_helper.sh
			#!/bin/bash
			echo "username=$GIT_USER"
			echo "password=$GIT_PASS"
			</source>


			Then set it in global config:
			<source lang=bash>
			git config --global credential.https://bitbucket.example.com.helper=~/.git/git_helper.sh
			</source>

	=Commands=		=Commands=

Pio2pio: /* Git clone */

2022-02-21T12:33:12Z

Git clone

← Older revision		Revision as of 14:33, 21 February 2022
Line 127:		Line 127:
	# Recursively clone the project and any submodules		# Recursively clone the project and any submodules
	git clone --recursive git@github.com/yourLogin/repository.git		git clone --recursive git@github.com/yourLogin/repository.git
	~~</source>~~


	# Clean up a previously initialized submodule		# Clean up a previously initialized submodule
Line 136:		Line 134:
	rm -rf $PATH_TO_SUBMODULE		rm -rf $PATH_TO_SUBMODULE
	rm -rf .git/modules/$SUBMODULE/		rm -rf .git/modules/$SUBMODULE/
			</source>
	=== Move a repository from GitLab to other GitLab ===		=== Move a repository from GitLab to other GitLab ===
	Let's assume you did clone a repo to your local machine. Notice you created --bare repository (can only push/fetch can't commit)		Let's assume you did clone a repo to your local machine. Notice you created --bare repository (can only push/fetch can't commit)

Pio2pio: /* Git clone */

2022-02-21T12:32:50Z

Git clone

← Older revision		Revision as of 14:32, 21 February 2022
Line 120:		Line 120:
	It a way to keep another Git repository within already existing projects. It's a way to to share a codebase with another independent codebase.		It a way to keep another Git repository within already existing projects. It's a way to to share a codebase with another independent codebase.
	<source lang=bash>		<source lang=bash>
	# Add a submodule, then commit and push		# Add/initialize a submodule, then commit and push
	git submodule add git@github.com/yourLogin/repository-submodule.git		touch .gitmodules
			git submodule add git@github.com/yourLogin/repository-submodule.git --branch master
			# Note: Add `branch = master` as the --branch flag does not do anything

	# Recursively clone the project and any submodules		# Recursively clone the project and any submodules
	git clone --recursive git@github.com/yourLogin/repository.git		git clone --recursive git@github.com/yourLogin/repository.git
	</source>		</source>


			# Clean up a previously initialized submodule
			SUBMODULE=scripts
			PATH_TO_SUBMODULE=scripts
			git rm --cached $PATH_TO_SUBMODULE # (no trailing slash) as well as
			rm -rf $PATH_TO_SUBMODULE
			rm -rf .git/modules/$SUBMODULE/

	=== Move a repository from GitLab to other GitLab ===		=== Move a repository from GitLab to other GitLab ===

Pio2pio: /* Git clone */

2022-02-21T12:02:56Z

Git clone

← Older revision		Revision as of 14:02, 21 February 2022
Line 111:		Line 111:

	== Git clone ==		== Git clone ==
	git clone git@github.com/yourLogin/repository.git #~~clones~~ using ~~ssh loaded in~~ ssh-add -l		<source lang=bash>
	git clone http://github.com/{project}/repository.git #clones using http/s, will prompt for username and password that exists in Github.		git clone git@github.com/yourLogin/repository.git # ssh cloning is using ssh-add -l
			git clone http://github.com/{project}/repository.git # clones using http/s, will prompt for username and password that exists in Github.
			</source>

	~~It will clone/add another project within already existing projects. It's a way to develop projects avoiding to create softlinks between projects.~~
	~~git submodule add git@github.com/yourLogin/repository-submodule.git~~

	It ~~will recursively clones~~ a project and ~~update subprojects(~~submodules)		;Submodules
	git clone --recursive git@github.com/yourLogin/repository.git		It a way to keep another Git repository within already existing projects. It's a way to to share a codebase with another independent codebase.
			<source lang=bash>
			# Add a submodule, then commit and push
			git submodule add git@github.com/yourLogin/repository-submodule.git
			# Recursively clone the project and any submodules
			git clone --recursive git@github.com/yourLogin/repository.git
			</source>


	=== Move a repository from GitLab to other GitLab ===		=== Move a repository from GitLab to other GitLab ===