Git Notes - Revision history

PeterHarding at 12:18, 3 November 2020

2020-11-03T12:18:06Z

← Older revision		Revision as of 22:18, 3 November 2020
Line 51:		Line 51:
	* git reset -- HEAD		* git reset -- HEAD
	* find dir -type f \| xargs git reset		* find dir -type f \| xargs git reset

			==List Objects==

			* git rev-list --objects -g --no-walk --all

PeterHarding at 15:57, 12 June 2014

2014-06-12T15:57:37Z

← Older revision		Revision as of 01:57, 13 June 2014
Line 1:		Line 1:
	Also see - [[Git_SCM_Notes]] \| [[Summary_of_Git_Commands]]		Also see - [[Git_SCM_Notes]] \| [[Summary_of_Git_Commands]] \| [[Getting Started with Git]]

	=Branching=		=Branching=
Line 56:		Line 56:


	Also see - [[Git_SCM_Notes]] \| [[Summary_of_Git_Commands]]		Also see - [[Git_SCM_Notes]] \| [[Summary_of_Git_Commands]] \| [[Getting Started with Git]]


	[[Category:Git]]		[[Category:Git]]
	[[Category:SCM]]		[[Category:SCM]]

PeterHarding at 15:55, 12 June 2014

2014-06-12T15:55:31Z

← Older revision		Revision as of 01:55, 13 June 2014
Line 1:		Line 1:
	Also see - [[Git_SCM_Notes]]		Also see - [[Git_SCM_Notes]] \| [[Summary_of_Git_Commands]]

	=Branching=		=Branching=
Line 56:		Line 56:


	Also see - [[Git_SCM_Notes]]		Also see - [[Git_SCM_Notes]] \| [[Summary_of_Git_Commands]]


	[[Category:Git]]		[[Category:Git]]
	[[Category:SCM]]		[[Category:SCM]]

PeterHarding at 15:53, 12 June 2014

2014-06-12T15:53:05Z

← Older revision		Revision as of 01:53, 13 June 2014
Line 1:		Line 1:
			Also see - [[Git_SCM_Notes]]

	=Branching=		=Branching=

	* gitbranch \--set-upstream xxx origin/xxx		* gitbranch --set-upstream xxx origin/xxx
	* git branch \-a		* git branch -a
	* git push origin xxx		* git push origin xxx
	* git push origin xxx:yyy		* git push origin xxx:yyy
Line 20:		Line 21:
	=Remotes=		=Remotes=

	* git ~~reote \~~-v		* git remote -v
	* git remote another [https://xxxx@xxxx.com/xxx/xxx.git]		* git remote another [https://xxxx@xxxx.com/xxx/xxx.git]
	* git remote add tim git://xxxxx@xxxx.com/xxx/repo.git		* git remote add tim git://xxxxx@xxxx.com/xxx/repo.git
Line 33:		Line 34:
	=Reviewing=		=Reviewing=

	* git log \--graph \--pretty=oneline		* git log --graph --pretty=oneline

	* git log -- ../bin/chk_lrs.py		* git log -- ../bin/chk_lrs.py
	* git diff xxx origin/xxx \--word-diff		* git diff xxx origin/xxx --word-diff
	* git diff master^\^ origin/master \--word-diff		* git diff master^\^ origin/master --word-diff

	=After a Conflict=		=After a Conflict=

	* git diff		* git diff
	* git checkout \--ours -- the_file		* git checkout --ours -- the_file
	* git checkout \--theirs -- the_file		* git checkout --theirs -- the_file

	=Other=		=Other=

	* git pull origin \+master:master		* git pull origin +master:master
	* git reset -- HEAD		* git reset -- HEAD
	* find dir -type f \| xargs git reset		* find dir -type f \| xargs git reset


	Note, this will discard local changes\!		Note, this will discard local changes!


			Also see - [[Git_SCM_Notes]]


	[[Category:Git]]		[[Category:Git]]
	[[Category:SCM]]		[[Category:SCM]]

PeterHarding at 07:36, 7 May 2014

2014-05-07T07:36:34Z

← Older revision		Revision as of 17:36, 7 May 2014
Line 1:		Line 1:

	~~h1.~~ Branching		=Branching=

	* gitbranch \--set-upstream xxx origin/xxx		* gitbranch \--set-upstream xxx origin/xxx
Line 8:		Line 8:
	* git checkout remote/origin/zzz		* git checkout remote/origin/zzz

	~~h2.~~ Low Level Stuff		==Low Level Stuff==

	$ cd .git/reps/heads		$ cd .git/reps/heads
Line 18:		Line 18:
	* git branch yesterday e79ff9e5926bd		* git branch yesterday e79ff9e5926bd

	~~h1.~~ Remotes		=Remotes=

	* git reote \-v		* git reote \-v
Line 27:		Line 27:
	* git diff xxx origin/xxx		* git diff xxx origin/xxx

	~~h1.~~ Broadcasting a Local Repo		=Broadcasting a Local Repo=

	* git serve		* git serve

	~~h1.~~ Reviewing		=Reviewing=

	* git log \--graph \--pretty=oneline		* git log \--graph \--pretty=oneline
Line 39:		Line 39:
	* git diff master^\^ origin/master \--word-diff		* git diff master^\^ origin/master \--word-diff

	~~h1.~~ After a Conflict		=After a Conflict=

	* git diff		* git diff
Line 45:		Line 45:
	* git checkout \--theirs -- the_file		* git checkout \--theirs -- the_file

	~~h1.~~ Other		=Other=

	* git pull origin \+master:master		* git pull origin \+master:master
			* git reset -- HEAD
			* find dir -type f \| xargs git reset


	Note, this will discard local changes\!		Note, this will discard local changes\!

PeterHarding: Created page with " h1. Branching * gitbranch \--set-upstream xxx origin/xxx * git branch \-a * git push origin xxx * git push origin xxx:yyy * git checkout remote/origin/zzz h2. Low Level Stu..."

2012-04-30T05:34:09Z

Created page with " h1. Branching * gitbranch \--set-upstream xxx origin/xxx * git branch \-a * git push origin xxx * git push origin xxx:yyy * git checkout remote/origin/zzz h2. Low Level Stu..."

New page

h1. Branching

* gitbranch \--set-upstream xxx origin/xxx
* git branch \-a
* git push origin xxx
* git push origin xxx:yyy
* git checkout remote/origin/zzz

h2. Low Level Stuff

$ cd .git/reps/heads
$ ls
$ cat xxx
$ cd ../objects/db
$ ls
* git checkout e79ff9e ==> Detached HEAD
* git branch yesterday e79ff9e5926bd

h1. Remotes

* git reote \-v
* git remote another [https://xxxx@xxxx.com/xxx/xxx.git]
* git remote add tim git://xxxxx@xxxx.com/xxx/repo.git
* git fetch originhttps
* git fetch
* git diff xxx origin/xxx

h1. Broadcasting a Local Repo

* git serve

h1. Reviewing

* git log \--graph \--pretty=oneline

* git log -- ../bin/chk_lrs.py
* git diff xxx origin/xxx \--word-diff
* git diff master^\^ origin/master \--word-diff

h1. After a Conflict

* git diff
* git checkout \--ours -- the_file
* git checkout \--theirs -- the_file

h1. Other

* git pull origin \+master:master

Note, this will discard local changes\!

[[Category:Git]]
[[Category:SCM]]