Development/Git/Recipes - Revision history

Odysseus: /* Working with stable branches */

2011-11-06T18:06:38Z

‎Working with stable branches

2011-08-30T19:16:23Z

‎Working with existing remote branches

2011-08-30T19:14:41Z

‎Cherry Picking

2011-08-30T19:11:44Z

‎Interactive Rebasing

2011-08-30T19:09:13Z

‎Viewing What You've Changed

2011-07-28T03:40:17Z

‎Interactive Rebasing

2011-06-05T09:30:49Z

‎Git Recipes

2011-05-25T11:37:38Z

‎Tracking Branches

2011-05-23T17:11:18Z

‎Creating / Deleting Remote Branches

2011-04-13T16:29:27Z

‎Cherry Picking

@@ Line 34: / Line 34: @@
 === Working with stable branches ===
-For kdelibs, kdepimlibs, kde-runtime, kate, konsole and kde-workspace, the remote stable branches are named as follows:
+The remote stable branches are named as follows:
   origin/KDE/4.6
-For these modules, to set up a local stable branch to track the remote stable branch:
+To set up a local stable branch to track the remote stable branch:
   git branch --track KDE/4.6 origin/KDE/4.6
@@ Line 46: / Line 46: @@
   git push origin KDE/4.6:KDE/4.6
 === Creating / Deleting Remote Branches ===

@@ Line 28: / Line 28: @@
   git checkout <local-branch>
-When you want to add your commits to the local branch, first update your local to the current remote state, then push your commits:
+When you want to add your commits to the remote branch, first update your local to the current remote state, then push your commits:
   git pull --rebase
   git push origin <local-branch>:<remote-branch>

@@ Line 82: / Line 82: @@
 === Cherry Picking ===
-Cherry picking is a way to copy a single commit from any local or remote branch to your current local branch.
+Cherry picking is a way to copy a single commit from any local or remote branch to your current local branch.  You can even add ''any'' remote repository you want to your local clone to cherry-pick from.
-When cherry picking between stable and unstable branches, use the following form:
+ git cherry-pick <original-commit>
- git cherry-pick -e -x <original-commit>
+When cherry picking between stable and unstable branches, ''always'' use the following form:
-Note you can add ''any'' remote repository to your local clone if cherry-pick from.
+ git cherry-pick -e -x <original-commit>
-;Common Options
+Common Options:
 '''-e''' will allow you to edit the commit message to add any extra details and to change the BUG/CCBUG/FIXED-IN messages.

@@ Line 108: / Line 108: @@
 where <parent-branch> is the branch you want to rebase onto.  This is usually the branch that you based the original local branch off or are remotely tracking, but can be any branch you want.
-To work with just the last x commits you made to a branch:
+To work with just the last n commits you made to a branch:
-  git rebase -i HEAD^x
+  git rebase -i HEAD^n
 HEAD^ is the terminology for saying "commit prior to head". HEAD~ works too. HEAD^^ would indicate 2 commits back, and so forth.

@@ Line 127: / Line 127: @@
   git diff --staged
   git diff --staged <filename>
 === Stashing Changes ===

← Older revision		Revision as of 03:40, 28 July 2011
Line 111:		Line 111:

	git rebase -i HEAD^x		git rebase -i HEAD^x
		+
		+	HEAD^ is the terminology for saying "commit prior to head". HEAD~ works too. HEAD^^ would indicate 2 commits back, and so forth.

	See http://book.git-scm.com/4_interactive_rebasing.html for full details.		See http://book.git-scm.com/4_interactive_rebasing.html for full details.

← Older revision		Revision as of 09:30, 5 June 2011
Line 2:		Line 2:

	Brief recipes for common use cases.		Brief recipes for common use cases.
		+
		+	=== Cloning a Repository ===
		+
		+	To clone a local copy of a KDE Git repository, find the repository on http://projects.kde.org/projects, choose the project, choose the Repository tab and copy the git clone command displayed:
		+
		+	git clone git://anongit.kde.org/<repository-name>
		+
		+	Note this clone will be read-only and you will not be able to push from it.
		+
		+	Alternatively, if you have the standard [[Development/Git/Configuration\|KDE Git configuration]] and know the name of the repository simply do:
		+
		+	git clone kde:<repository-name>
		+
		+	This will automatically set the repository up to have push access.

	=== Working with existing remote branches ===		=== Working with existing remote branches ===

@@ Line 64: / Line 64: @@
 To change the branch the current branch is tracking to a different local or remote branch:
-  git branch --set-upstream <branch>
+  git branch --set-upstream <existing-branch> <new-upstream-branch>
 === Cherry Picking ===

← Older revision		Revision as of 17:11, 23 May 2011
Line 55:		Line 55:

	git push origin :<remote-branch>		git push origin :<remote-branch>
		+
		+	=== Tracking Branches ===
		+
		+	To create a new branch that tracks an existing local or remote branch:
		+
		+	git branch --track <new-branch> <existing-branch>
		+
		+	To change the branch the current branch is tracking to a different local or remote branch:
		+
		+	git branch --set-upstream <branch>

	=== Cherry Picking ===		=== Cherry Picking ===

@@ Line 72: / Line 72: @@
 '''-x''' will automatically add the original commit number to the end of the commit message to enable better tracing and to simplify merging.  Only do this if the original commit was already published in a public repository, e.g. your are forward porting or back porting the patch.
-'''-n''' will cherry-pick the changes but not commit them to the new branch.  This is very use full if you need to do further work on a commit.
+'''-n''' will cherry-pick the changes but not commit them to the new branch.  This is very useful if you need to do further work on a commit.
 === Interactive Rebasing ===