Basic Git usage - Revision history

Superdump: /* Basic operations */

2008-05-21T16:32:27Z

Basic operations

← Older revision		Revision as of 09:32, 21 May 2008
Line 13:		Line 13:
	git-pull		git-pull

	Make some changes, ~~commit them~~, revert ~~to a particular commit on~~ the ~~current branch~~:		Make some changes, decide they're bad, revert the changes:
	git-reset --soft <commit>		git-reset --soft <commit>

			Make some changes, commit them, decide to revert the commit:
			git-revert <commit>

	Make a branch:		Make a branch:

Reimar: /* Basic operations */

2008-02-12T10:24:12Z

Basic operations

← Older revision		Revision as of 03:24, 12 February 2008
Line 27:		Line 27:
	Delete a branch (irrespective of merge status, <b>removing</b> the history):		Delete a branch (irrespective of merge status, <b>removing</b> the history):
	git-branch -D <name of branch>		git-branch -D <name of branch>

			To "fix" the last commit/commit message:
			git-commit --amend

	== Specifying revisions ==		== Specifying revisions ==

Multimedia Mike: /* Guis and helper scripts */ proper intra-wiki link

2008-01-30T16:47:07Z

Guis and helper scripts: proper intra-wiki link

← Older revision		Revision as of 09:47, 30 January 2008
Line 33:		Line 33:

	= Guis and helper scripts =		= Guis and helper scripts =
	~~http~~:~~//wiki.multimedia.cx/index.php?title=Git_Guis~~		Main article: [[Git Guis]]

	git-*.sh at http://www1.mplayerhq.hu/~reimar/		Also see git-*.sh at http://www1.mplayerhq.hu/~reimar/

	= Working on a series of incremental, dependent patches =		= Working on a series of incremental, dependent patches =

Superdump at 14:31, 28 January 2008

2008-01-28T14:31:20Z

← Older revision		Revision as of 07:31, 28 January 2008
Line 44:		Line 44:
	git-commit -a		git-commit -a
	Prepare patches for e-mail submission (this creates the patches numbered and in order for easy submission):		Prepare patches for e-mail submission (this creates the patches numbered and in order for easy submission):
	git-format-patch ~~origin~~		git-format-patch <commit>

	Generate a diff of branch 2 against branch 1 (i.e. branch 1 + patch = branch 2)		Generate a diff of branch 2 against branch 1 (i.e. branch 1 + patch = branch 2)
	git-diff <name of branch 1> <name of branch 2>		git-diff <name of branch 1> <name of branch 2>

	Apply a git-diff style patch in a working Git tree:		Apply and commit a git-diff style patch in a working Git tree:
	git-am foo.patch		git-am foo.patch
	Apply a git-diff style patch in any working directory containing the correct source files to be patched:		Apply a git-diff style patch in any working directory containing the correct source files to be patched:
	git-apply foo.patch		git-apply foo.patch
			(Note: git-am will create a new commit using the extra metadata for the commit message, etc. whereas git-apply just patches the files)

			When submitting a set of patches to be applied in order, it is common to want to go back and edit one of the intermediate commits depending on feedback for the patches. This process can be easily achieved using the marvellous git-rebase:

			git-rebase -i <commit preceding the ones in which interested>

			(Note: When using git-rebase, it uses the $EDITOR environment variable so make sure it's set to your text editor of choice.)

	~~(Note: git-am~~ will ~~create~~ a ~~new commit using~~ the ~~extra metadata for~~ the commit ~~message~~, ~~etc~~. ~~whereas git-apply just patches the files)~~		This will display a list of the commits from the one after that specified and HEAD and gives you the opportunity to remove commits, reorder them, edit them and 'squash' a commit into the one preceding it. When you've edited this list accordingly you should be presented with those commits that were requested to be edited, or need editing, in order. Cool, huh? :)

	~~Revert the last n (where n is a positive int~~) ~~commits from the active branch:~~
	~~git-reset --hard HEAD~n~~

	= ~~get~~ a hack out of the way =		= Get a hack out of the way =
	You probably need a fairly new version of git for this feature.		You probably need a fairly new version of git for this feature.

Line 67:		Line 71:
	To get them back again:		To get them back again:
	git-stash apply		git-stash apply

	~~= WANTED =~~

	~~(Note: When using the following method, I wholly expect it uses the $EDITOR environment variable so make sure it's set to your text editor of choice.)~~

	When submitting a set of patches to be applied in order, it is common to want to go back and edit one of the intermediate commits depending on feedback for the patches. This process can be easily achieved using the marvellous git-rebase:

	~~git-rebase -i <commit preceding the ones in which interested>~~

	This will display a list of the commits from the one after that specified and HEAD and gives you the opportunity to remove commits, reorder them, edit them and 'squash' a commit into the one preceding it. When you've edited this list accordingly you should be presented with those commits that were requested to be edited, or need editing, in order. Cool, huh? :)

Superdump: /* Fundamentals */

2008-01-28T14:22:40Z

Fundamentals

← Older revision		Revision as of 07:22, 28 January 2008
Line 1:		Line 1:
	= Fundamentals =		= Fundamentals =

			== Basic operations ==

	Initial checkout:		Initial checkout:
Line 11:		Line 13:
	git-pull		git-pull

	Make some changes, commit them, revert to a particular commit on the current branch ~~<b>deleting the commits that came after and their history</b>~~:		Make some changes, commit them, revert to a particular commit on the current branch:
	git-reset --~~hard~~ <commit>		git-reset --soft <commit>

	Make a branch:		Make a branch:
Line 25:		Line 27:
	Delete a branch (irrespective of merge status, <b>removing</b> the history):		Delete a branch (irrespective of merge status, <b>removing</b> the history):
	git-branch -D <name of branch>		git-branch -D <name of branch>

			== Specifying revisions ==

			The syntax for specifying particular commits from branches in git is a little complex but is covered in the 'SPECIFYING REVISIONS' section of the git-rev-parse man page. [http://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html git-rev-parse html man page]

	= Guis and helper scripts =		= Guis and helper scripts =

Superdump: /* Fundamentals */

2008-01-28T14:17:59Z

Fundamentals

← Older revision		Revision as of 07:17, 28 January 2008
Line 11:		Line 11:
	git-pull		git-pull

	Make some changes, revert to a particular commit on the ~~master~~ branch:		Make some changes, commit them, revert to a particular commit on the current branch <b>deleting the commits that came after and their history</b>:
	git-reset --hard <commit>		git-reset --hard <commit>

Superdump: /* Fundamentals */

2008-01-28T14:13:49Z

Fundamentals

← Older revision		Revision as of 07:13, 28 January 2008
Line 20:		Line 20:
	git-checkout <name of branch>		git-checkout <name of branch>

	Delete a branch (keeping the history):		Delete a branch (must be merged with HEAD of current branch, keeping the history):
	git-branch -d <name of branch>		git-branch -d <name of branch>

	Delete a branch (<b>removing</d> the history):		Delete a branch (irrespective of merge status, <b>removing</b> the history):
	git-branch -D <name of branch>		git-branch -D <name of branch>

Superdump: /* Fundamentals */

2008-01-28T14:11:40Z

Fundamentals

← Older revision		Revision as of 07:11, 28 January 2008
Line 20:		Line 20:
	git-checkout <name of branch>		git-checkout <name of branch>

	Delete a branch:		Delete a branch (keeping the history):
			git-branch -d <name of branch>

			Delete a branch (<b>removing</d> the history):
	git-branch -D <name of branch>		git-branch -D <name of branch>

Superdump: /* Fundamentals */

2008-01-28T14:10:41Z

Fundamentals

← Older revision		Revision as of 07:10, 28 January 2008
Line 4:		Line 4:
	git-clone git://git.mplayerhq.hu/ffmpeg ffmpeg-git		git-clone git://git.mplayerhq.hu/ffmpeg ffmpeg-git

	Update:		And if you want libswscale as well:
			cd ffmpeg-git
			git-clone git://git.mplayerhq.hu/libswscale

			Update (this has to be done in ffmpeg-git and in its libswscale subdir as they are currently separate repositories):
	git-pull		git-pull

	Make some changes, revert to ~~head~~ on master branch:		Make some changes, revert to a particular commit on the master branch:
	git-reset --hard ~~HEAD~~		git-reset --hard <commit>

	Make a branch:		Make a branch:
Line 18:		Line 22:
	Delete a branch:		Delete a branch:
	git-branch -D <name of branch>		git-branch -D <name of branch>


	= Guis and helper scripts =		= Guis and helper scripts =

Superdump: /* WANTED */

2008-01-28T14:06:53Z

WANTED

← Older revision		Revision as of 07:06, 28 January 2008
Line 58:		Line 58:
	= WANTED =		= WANTED =

	When ~~submitting a set of patches~~, it ~~is common to want~~ to ~~go back and edit one~~ of ~~the intermediate commits depending on feedback for the patches~~. ~~This process involves something like:~~		(Note: When using the following method, I wholly expect it uses the $EDITOR environment variable so make sure it's set to your text editor of choice.)
	* Revert to the commit before the one that needs to be edited.
	* Apply the patch without committing, edit the code.
	* Commit the new code, make a new patch.
	* Merge subsequent commits (the patches that followed).

	~~People have suggested using 'quilt' but I wanted~~ to ~~use Git~~ to ~~see if it could handle such a~~ process~~. it has been suggested that~~ the ~~following approach should work~~:		When submitting a set of patches to be applied in order, it is common to want to go back and edit one of the intermediate commits depending on feedback for the patches. This process can be easily achieved using the marvellous git-rebase:

	~~HEAD is the state of the code after application of all the patches (i.e. when you ran <code>~~git-~~format~~-~~patches origin~~<~~/code>) so we want to revert to the~~ commit ~~before~~ the ~~patch that needs to be edited. You could make a new branch at version HEAD - n:~~		git-rebase -i <commit preceding the ones in which interested>
	~~git-branch <name of branch~~> ~~HEAD~n~~

	~~Then switch to~~ that ~~branch:~~		This will display a list of the commits from the one after that specified and HEAD and gives you the opportunity to remove commits, reorder them, edit them and 'squash' a commit into the one preceding it. When you've edited this list accordingly you should be presented with those commits that were requested to be edited, or need editing, in order. Cool, huh? :)
	~~git-checkout <name of branch>~~

	~~Reapply~~ the ~~patch without committing (using <code>git-apply</code>~~, ~~not <code>git-am</code>)~~, edit the ~~code appropriately, then commit again~~. ~~Then we want~~ to ~~merge~~ in ~~(some of~~?~~) the subsequent commits. We can cherry pick the HEAD-n th commit from another branch (not preserving history!) as follows:~~
	~~git-cherry-pick <name of branch>~n~~
	~~(Note~~: ~~cherry pick can only apply to a clean branch, that is where there are no alterations since the HEAD commit~~)

	~~Maybe there is a better procedure but this seems to make sense, even if it seems a little cumbersome.~~