Git phrasebook - Revision history

Nkinkade: /* cgit tips and tricks */

2009-10-13T22:46:23Z

‎cgit tips and tricks

2009-10-02T23:16:53Z

‎cgit tips and tricks

2009-10-02T23:16:09Z

‎cgit tips and tricks

2009-10-02T23:15:20Z

‎cgit tips and tricks

2009-10-02T23:10:59Z

2008-11-25T21:41:25Z

No more refs/heads neede

2008-11-12T23:59:33Z

‎Making a local branch available as a remote branch

2008-08-19T18:50:07Z

git push --tags

2008-07-10T06:20:12Z

‎Making a local branch available as a remote branch

2008-07-09T22:20:27Z

undoing a git-add

@@ Line 67: / Line 67: @@
 If you want to view a diff of changes to a file between arbitrary revisions you can formulate a URL like:
-<nowiki>http://$domain/$cgit/$repository/diff/$pathtofile?id=$newer-commit&id2=$older-commit</nowiki>
+<nowiki>http://$domain/$cgit/$repository/diff/$pathtofile?id=$newer-sha1&id2=$older-sha1</nowiki>
 Example: http://code.creativecommons.org/viewgit/civicrm.git/diff/bin/ContributionProcessor.php?id=ce519f4c83f6b1208394c14e88309a9d8493c1b4&id2=87fdecb84f70e4e46af741de3430844ee2d9333c
@@ Line 73: / Line 73: @@
 If you want to view a file in the tree as it appeared at a given commit you can formulate a URL like:
-<nowiki>http://$domain/$cgit/$repository/plain/$pathtofile?id=$commit</nowiki>
+<nowiki>http://$domain/$cgit/$repository/plain/$pathtofile?id=$sha1</nowiki>
 Example: http://code.creativecommons.org/viewgit/civicrm.git/plain/bin/OneClickDonate.php?id=1c7708665008b3f5775b6535df3094e0633fd227

@@ Line 67: / Line 67: @@
 If you want to view a diff of changes to a file between arbitrary revisions you can formulate a URL like:
-http://$domain/$cgit/$repository/diff/$pathtofile?id=$newer-commit&id2=$older-commit
+<nowiki>http://$domain/$cgit/$repository/diff/$pathtofile?id=$newer-commit&id2=$older-commit</nowiki>
 Example: http://code.creativecommons.org/viewgit/civicrm.git/diff/bin/ContributionProcessor.php?id=ce519f4c83f6b1208394c14e88309a9d8493c1b4&id2=87fdecb84f70e4e46af741de3430844ee2d9333c
@@ Line 73: / Line 73: @@
 If you want to view a file in the tree as it appeared at a given commit you can formulate a URL like:
-http://$domain/$cgit/$repository/plain/$pathtofile?id=$commit
+<nowiki>http://$domain/$cgit/$repository/plain/$pathtofile?id=$commit</nowiki>
 Example: http://code.creativecommons.org/viewgit/civicrm.git/plain/bin/OneClickDonate.php?id=1c7708665008b3f5775b6535df3094e0633fd227

@@ Line 67: / Line 67: @@
 If you want to view a diff of changes to a file between arbitrary revisions you can formulate a URL like:
-http://$domain/$cgit/$repository/diff/$pathtofile?id=$newestcommit&id2=$oldestcommit
+http://$domain/$cgit/$repository/diff/$pathtofile?id=$newer-commit&id2=$older-commit
 Example: http://code.creativecommons.org/viewgit/civicrm.git/diff/bin/ContributionProcessor.php?id=ce519f4c83f6b1208394c14e88309a9d8493c1b4&id2=87fdecb84f70e4e46af741de3430844ee2d9333c

@@ Line 64: / Line 64: @@
   git push --tags
-== cgit tips and tricks ==
+== [http://hjemli.net/git/cgit/about/ cgit] tips and tricks ==
 If you want to view a diff of changes to a file between arbitrary revisions you can formulate a URL like:
 http://$domain/$cgit/$repository/diff/$pathtofile?id=$newestcommit&id2=$oldestcommit
-For example: http://code.creativecommons.org/viewgit/civicrm.git/diff/bin/ContributionProcessor.php?id=ce519f4c83f6b1208394c14e88309a9d8493c1b4&id2=87fdecb84f70e4e46af741de3430844ee2d9333c
+Example: http://code.creativecommons.org/viewgit/civicrm.git/diff/bin/ContributionProcessor.php?id=ce519f4c83f6b1208394c14e88309a9d8493c1b4&id2=87fdecb84f70e4e46af741de3430844ee2d9333c

← Older revision		Revision as of 23:10, 2 October 2009
Line 63:		Line 63:
	git-push does not automatically push any tags you may have created. For this, use		git-push does not automatically push any tags you may have created. For this, use
	git push --tags		git push --tags
		+
		+	== cgit tips and tricks ==
		+	If you want to view a diff of changes to a file between arbitrary revisions you can formulate a URL like:
		+
		+	http://$domain/$cgit/$repository/diff/$pathtofile?id=$newestcommit&id2=$oldestcommit
		+
		+	For example: http://code.creativecommons.org/viewgit/civicrm.git/diff/bin/ContributionProcessor.php?id=ce519f4c83f6b1208394c14e88309a9d8493c1b4&id2=87fdecb84f70e4e46af741de3430844ee2d9333c

@@ Line 31: / Line 31: @@
 If you want to change the branch name:
-  git push origin LOCAL_BRANCH_NAME:refs/heads/REMOTE_BRANCH_NAME
+  git push origin LOCAL_BRANCH_NAME:REMOTE_BRANCH_NAME
 == Undo local changes to a file ==

← Older revision		Revision as of 23:59, 12 November 2008
Line 32:		Line 32:

	git push origin LOCAL_BRANCH_NAME:refs/heads/REMOTE_BRANCH_NAME		git push origin LOCAL_BRANCH_NAME:refs/heads/REMOTE_BRANCH_NAME
		+	== Undo local changes to a file ==
		+
		+	Have you changed FILE in a way that you never want to commit? Just check out the version in the current HEAD with:
		+
		+	git checkout FILE

	== Configuring git to push a particular local branch to a particular remote branch every time you call "git push" ==		== Configuring git to push a particular local branch to a particular remote branch every time you call "git push" ==

← Older revision		Revision as of 18:50, 19 August 2008
Line 54:		Line 54:
	git reset		git reset
	will clear out your index, in case you git-add'd something that you didn't want to.		will clear out your index, in case you git-add'd something that you didn't want to.
		+
		+	== Pushing tags ==
		+	git-push does not automatically push any tags you may have created. For this, use
		+	git push --tags

← Older revision		Revision as of 06:20, 10 July 2008
Line 25:		Line 25:

	== Making a local branch available as a remote branch ==		== Making a local branch available as a remote branch ==
		+	To make the branch BRANCH_NAME appear as a remote branch called BRANCH_NAME:
		+
		+	git push origin BRANCH_NAME
		+
		+	If you want to change the branch name:
		+
	git push origin LOCAL_BRANCH_NAME:refs/heads/REMOTE_BRANCH_NAME		git push origin LOCAL_BRANCH_NAME:refs/heads/REMOTE_BRANCH_NAME

← Older revision		Revision as of 22:20, 9 July 2008
Line 44:		Line 44:
	cd .. # top level of project		cd .. # top level of project
	git add path/to/submodule # NOTE: No trailing slash!		git add path/to/submodule # NOTE: No trailing slash!
		+
		+	== Undoing a git-add ==
		+	git reset
		+	will clear out your index, in case you git-add'd something that you didn't want to.