GIT - Versionsgeschichte

Christofbuechi am 4. Oktober 2017 um 06:54 Uhr

2017-10-04T06:54:07Z

2017-09-13T20:05:43Z

2017-08-25T07:29:55Z

2017-03-01T08:09:11Z

2017-01-30T14:45:11Z

2017-01-30T14:44:54Z

2016-11-03T13:12:26Z

2016-04-14T12:03:23Z

2015-04-03T21:14:30Z

‎Commands

2014-10-11T18:08:55Z

‎Commands

← Nächstältere Version		Version vom 4. Oktober 2017, 06:54 Uhr
Zeile 1:		Zeile 1:
		+	= Basics =
		+	* [[BasicGit\|BasicGit]]
	= Commands =		= Commands =
	Delete all remotely deleted files		Delete all remotely deleted files

@@ Zeile 5: / Zeile 5: @@
 View File 2 Commits before
   git show HEAD~2:public/app/styles/main.css
 Search File in Log

← Nächstältere Version		Version vom 25. August 2017, 07:29 Uhr
Zeile 31:		Zeile 31:

	it allows you to revert a merge if accidentally happen		it allows you to revert a merge if accidentally happen
		+
		+	Set new remote tracking branch:
		+	git branch --set-upstream-to origin/branchname branchname

← Nächstältere Version		Version vom 1. März 2017, 08:09 Uhr
Zeile 23:		Zeile 23:
	rebase a commit-history to a new base. Means if you have a few commits local, which are based on a commit from a different branch,		rebase a commit-history to a new base. Means if you have a few commits local, which are based on a commit from a different branch,
	you can move this stack of commits to another branch or commit. Basically it is a cut and paste of commits on a new base		you can move this stack of commits to another branch or commit. Basically it is a cut and paste of commits on a new base
		+
		+	Merge -no fast forward
		+	Git creates no merge commit if the merge is fast forward. To force git to make a commit:
		+	http://stackoverflow.com/questions/2500296/can-i-make-fast-forwarding-be-off-by-default-in-git
		+	for all branches in the repo (git config --add merge.ff false)
		+	Or git merge -no-ff in every merge
		+
		+	it allows you to revert a merge if accidentally happen

← Nächstältere Version		Version vom 30. Januar 2017, 14:45 Uhr
Zeile 21:		Zeile 21:

	Rebase		Rebase
−	rebase a commit-history to a new base. Means if you have a few commits local, which are based on a commit from a different branch, you can move this stack of commits to another branch or commit. Basically it is a cut and paste of commits on a new base	+	rebase a commit-history to a new base. Means if you have a few commits local, which are based on a commit from a different branch,
		+	you can move this stack of commits to another branch or commit. Basically it is a cut and paste of commits on a new base

← Nächstältere Version		Version vom 30. Januar 2017, 14:44 Uhr
Zeile 19:		Zeile 19:
	Set new remote url for git repo:		Set new remote url for git repo:
	git remote set-url origin git@github.com:ChristofBuechi/RetrofitExample.git		git remote set-url origin git@github.com:ChristofBuechi/RetrofitExample.git
		+
		+	Rebase
		+	rebase a commit-history to a new base. Means if you have a few commits local, which are based on a commit from a different branch, you can move this stack of commits to another branch or commit. Basically it is a cut and paste of commits on a new base

← Nächstältere Version		Version vom 3. November 2016, 13:12 Uhr
Zeile 16:		Zeile 16:
	git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"		git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
	just use git lg		just use git lg
		+
		+	Set new remote url for git repo:
		+	git remote set-url origin git@github.com:ChristofBuechi/RetrofitExample.git

← Nächstältere Version		Version vom 14. April 2016, 12:03 Uhr
Zeile 8:		Zeile 8:
	Search File in Log		Search File in Log
	git log --diff-filter=D --summary \| grep '''filename''' \| awk '{print $4; exit}' \| xargs git log --all --		git log --diff-filter=D --summary \| grep '''filename''' \| awk '{print $4; exit}' \| xargs git log --all --
		+
		+	Nice Git log
		+	git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
		+	src: https://coderwall.com/p/euwpig/a-better-git-log
		+
		+	As git alias command:
		+	git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
		+	just use git lg

← Nächstältere Version		Version vom 3. April 2015, 21:14 Uhr
Zeile 5:		Zeile 5:
	View File 2 Commits before		View File 2 Commits before
	git show HEAD~2:public/app/styles/main.css		git show HEAD~2:public/app/styles/main.css
		+
		+	Search File in Log
		+	git log --diff-filter=D --summary \| grep '''filename''' \| awk '{print $4; exit}' \| xargs git log --all --

← Nächstältere Version		Version vom 11. Oktober 2014, 18:08 Uhr
Zeile 2:		Zeile 2:
	Delete all remotely deleted files		Delete all remotely deleted files
	git rm $(git ls-files --deleted)		git rm $(git ls-files --deleted)
		+
		+	View File 2 Commits before
		+	git show HEAD~2:public/app/styles/main.css