Git - Revision history

Hdridder: /* Workflow making changes */

2026-09-01T06:58:02Z

Workflow making changes

← Older revision		Revision as of 06:58, 1 September 2026
Line 45:		Line 45:
	;git add --all		;git add --all
	:Add all changed files to the repository		:Add all changed files to the repository
			;git restore <file>
			:Restore a file to it's last committed stage
	;git commit -m "Message"		;git commit -m "Message"
	:Commit your changes		:Commit your changes
Line 57:		Line 59:
	:Update master with your changes, fix conflicts		:Update master with your changes, fix conflicts
	;git push		;git push
	:Update the remote repository		:Update the remote repository

	=Other commands=		=Other commands=

2024-06-20T18:05:29Z

Other commands

@@ Line 35: / Line 35: @@
 * Open a "pull request" (propose changes to the master branch)
 * "Merge" your branch to the master branch
 =Other commands=
 Check the [https://www.atlassian.com/git/tutorials/atlassian-git-cheatsheet cheatsheet] for more.
 ;<code>git config --local -l</code>
 :List your configuration for this repository (in the current directory).

2024-05-17T08:47:36Z

Using Git

← Older revision		Revision as of 08:47, 17 May 2024
Line 1:		Line 1:
	=Using Git=		=Using Git=

			This [https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow Atlassian workflow] looks like a good way to work with git.

	Here is a basic overview of how you can work with git@bitbucket:		Here is a basic overview of how you can work with git@bitbucket:

2023-03-20T10:26:11Z

← Older revision		Revision as of 10:26, 20 March 2023
Line 67:		Line 67:
	;<code>git log</code>		;<code>git log</code>
	:Show all commits		:Show all commits

			=Conflict resolution=
			Git merge tries to merge files from 2 branches when they differ. If that is not possible (e.g. as both files have changes in the same lines) the file will mark the conflicting parts.

			<<<<<<< HEAD
			Lines in the current branch
			=======
			Lines in the merged branch
			>>>>>>> <name of the merged branch>

			The ======= is the center of the conflict. Check which lines you want to be in and remove everything else (including the conflict markerd).

2023-02-22T20:39:24Z

Other commands

← Older revision		Revision as of 20:39, 22 February 2023
Line 65:		Line 65:
	;<code>git pull</code>		;<code>git pull</code>
	:Fetch all changes made remote and merge to current branch		:Fetch all changes made remote and merge to current branch
			;<code>git log</code>
			:Show all commits

2023-01-26T13:33:28Z

Other commands

← Older revision		Revision as of 13:33, 26 January 2023
Line 34:		Line 34:

	=Other commands=		=Other commands=
			Check the [https://www.atlassian.com/git/tutorials/atlassian-git-cheatsheet cheatsheet] for more.
	;<code>git config --local -l</code>		;<code>git config --local -l</code>
	:List your configuration for this repository (in the current directory).		:List your configuration for this repository (in the current directory).
Line 46:		Line 47:
	;<code>git commit -a</code>		;<code>git commit -a</code>
	:Commit all local changes to the local repository.		:Commit all local changes to the local repository.
			;<code>git branch <branchname></code>
			:Create a new branche
			;<code>git checkout <branchname></code>
			:Make <branchename> current
			;<code>git checkout -b <branchname></code>
			:Make <branchename> and make it current (combine above 2 commands)
	;<code>git reset HEAD <path></code>		;<code>git reset HEAD <path></code>
	:Reset commit status for <path>		:Reset commit status for <path>

2023-01-23T15:11:01Z

Other commands

← Older revision		Revision as of 15:11, 23 January 2023
Line 48:		Line 48:
	;<code>git reset HEAD <path></code>		;<code>git reset HEAD <path></code>
	:Reset commit status for <path>		:Reset commit status for <path>
			;<code>git fetch</code>
			:Fetch all changes made remote
			;<code>git merge <branch></code>
			:Merge <branch> into the current branch
			;<code>git branch --all</code>
			:Show all branches in this repository
	;<code>git push</code>		;<code>git push</code>
	:Send the repository remote~~<path>~~		:Send the repository remote
	;<code>git pull</code>		;<code>git pull</code>
	:Fetch all changes made remote~~<path>~~		:Fetch all changes made remote and merge to current branch

2023-01-14T22:46:48Z

For a project you have files for already

← Older revision		Revision as of 22:46, 14 January 2023
Line 22:		Line 22:
	* Create a "repository" (project) with a git hosting tool (like Bitbucket)		* Create a "repository" (project) with a git hosting tool (like Bitbucket)
	* <code>git init</code> (initialize the local repository)		* <code>git init</code> (initialize the local repository)
			* <code>git pull <Repository URL(for bitbucket look under the Clone Button)></code> master
	* <code>git add .</code> (Add all file to the local repository)		* <code>git add .</code> (Add all file to the local repository)
	* <code>git commit -m 'Initial upload'</code>		* <code>git commit -m 'Initial upload'</code>

2023-01-14T20:44:03Z

Hdridder moved page BitBucket to Git

← Older revision		Revision as of 20:44, 14 January 2023
(No difference)

2023-01-12T10:22:02Z

Using Git

← Older revision		Revision as of 10:22, 12 January 2023
Line 1:		Line 1:
	=Using Git=		=Using Git=
	Here is a basic overview of how you can work with git@bitbucket:		Here is a basic overview of how you can work with git@bitbucket:

			Initialize git on your computer:
			<syntaxhighlight lang=bash>
			git config --global user.name "<your name>"
			git config --global user.email "<your emailaddress>"
			</syntaxhighlight>

	* Add your public key in your profile - 'Personal Settings' - 'SSH keys'		* Add your public key in your profile - 'Personal Settings' - 'SSH keys'
Line 25:		Line 31:
	* Open a "pull request" (propose changes to the master branch)		* Open a "pull request" (propose changes to the master branch)
	* "Merge" your branch to the master branch		* "Merge" your branch to the master branch


	=Other commands=		=Other commands=