Comp:git - Revision history

Gerritg: /* Possible workflow */

2024-03-02T10:20:44Z

Possible workflow

← Older revision		Revision as of 10:20, 2 March 2024
Line 103:		Line 103:
	git commit # commit the new stuff		git commit # commit the new stuff
	git push # the "remote" repository will be updated		git push # the "remote" repository will be updated

			To continue working on this project on your desktop:

			cd ~/hworld
			git pull

			If you had uncommitted changes in files under git control you may get an error message about a "merge conflict". You will need to read about resolving get merge conflict in one of the many online tutorials.

			Each "commit" is assigned a "hash" - you see those hashes with <tt>git log</tt> or <tt>git log2</tt>, they look like something this: <tt>0869ae0</tt>

			git checkout 0869ae0 # find the commit hash with "git log"

			git checkout main # go back to most recent version

			At some point you may find it useful to get a deeper understanding of how git actually works, I found this youtube video [https://www.youtube.com/watch?v=hZS96dwKvt0 How to be a git expert] useful.

Gerritg: drop username

2024-03-02T10:02:47Z

drop username

← Older revision		Revision as of 10:02, 2 March 2024
Line 97:		Line 97:

	# make sure to use ssh keys, so you do not need to enter a password to access the git repo		# make sure to use ssh keys, so you do not need to enter a password to access the git repo
	git clone ~~username@~~lilo.science.ru.nl:/home/username/repos/hworld		git clone lilo.science.ru.nl:/home/username/repos/hworld
	cd hworld		cd hworld
	# continue working on hw.sh, create new files, etc.		# continue working on hw.sh, create new files, etc.

Gerritg: /* Create .gitconfig */

2024-03-02T09:53:01Z

Create .gitconfig

← Older revision		Revision as of 09:53, 2 March 2024
Line 9:		Line 9:

	[user]		[user]
	name = Firstname M. Lastname		name = Firstname M. Lastname
	email = username@science.ru.nl		email = username@science.ru.nl

	This is all that is needed, but more settings can be added:		This is all that is needed, but more settings can be added:

	[init]		[init]
	defaultBranch = main # change the default branch name "master" to "main"		defaultBranch = main # change the default branch name "master" to "main"
	[color]		[color]
	ui = auto		ui = auto
	[core]		[core]
	pager = more # or less		pager = more # or less
	[diff]		[diff]
	tool = vimdiff # if you use vi or vim		tool = vimdiff # if you use vi or vim
	[alias]		[alias]
	log1 = 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		log1 = 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
	log2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all		log2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all

	== Start a new project ==		== Start a new project ==

Gerritg: /* Possible workflow */

2024-03-02T09:49:52Z

Possible workflow

← Older revision		Revision as of 09:49, 2 March 2024
Line 93:		Line 93:

	git push		git push

			To work on this project on a different computer, you "clone" the project. For example, switch to your laptop

			# make sure to use ssh keys, so you do not need to enter a password to access the git repo
			git clone username@lilo.science.ru.nl:/home/username/repos/hworld
			cd hworld
			# continue working on hw.sh, create new files, etc.
			git add hw.sh
			git commit # commit the new stuff
			git push # the "remote" repository will be updated

Gerritg: /* bare repo and workflow */

2024-03-02T09:40:38Z

bare repo and workflow

@@ Line 31: / Line 31: @@
     mkdir hworld
     cd hworld
-    cat <<EOF > hw.sh
     #!/bin/bash
     echo "hello world"
-    EOF
     chmod +x hw.sh
@@ Line 43: / Line 45: @@
     git init             # this creates a subdirectory .git where git keeps info
     git add hw.sh        # we want to use git to keep track of this file, it will be added to the "staging area"
-    git commit
+    git commit -m "feat: initial commit" hw.sh

Gerritg: git init

2024-03-02T08:54:18Z

git init

@@ Line 1: / Line 1: @@
-To share your software you can use our [https://gitlab.science.ru.nl/theochem gitlab server]. Here are instructions to set up a git repository on disk.
+To share your software you can use our [https://gitlab.science.ru.nl/theochem gitlab server].
 == Create .gitconfig ==
@@ Line 24: / Line 27: @@
 == Start a new project ==

Gerritg: /* Create .gitconfig */

2024-03-02T08:40:38Z

Create .gitconfig

← Older revision		Revision as of 08:40, 2 March 2024
Line 22:		Line 22:
	log1 = 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		log1 = 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
	log2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all		log2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all

			== Start a new project ==

Gerritg: git, gitlab, .gitconfig

2024-03-02T08:37:05Z

git, gitlab, .gitconfig

New page

To share your software you can use our [https://gitlab.science.ru.nl/theochem gitlab server]. Here are instructions to set up a git repository on disk.

== Create .gitconfig ==

In your home directory create a file with the name <tt>.gitconfig</tt> with the content:

[user]
name = Firstname M. Lastname
email = username@science.ru.nl

This is all that is needed, but more settings can be added:

[init]
defaultBranch = main # change the default branch name "master" to "main"
[color]
ui = auto
[core]
pager = more # or less
[diff]
tool = vimdiff # if you use vi or vim
[alias]
log1 = 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
log2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all