Development/Tutorials/Git/Basics - Revision history

AnneW: moved Archive:Development/Tutorials/Git/Basics to Development/Tutorials/Git/Basics: revert

2012-03-24T19:45:38Z

moved Archive:Development/Tutorials/Git/Basics to Development/Tutorials/Git/Basics: revert

AnneW: moved Development/Tutorials/Git/Basics to Archive:Development/Tutorials/Git/Basics

2012-03-24T19:17:25Z

moved Development/Tutorials/Git/Basics to Archive:Development/Tutorials/Git/Basics

Neverendingo: Text replace - "" to ""

2011-06-29T20:51:42Z

Text replace - "</code>" to "</syntaxhighlight>"

Neverendingo: Text replace - "`" to ""`


2011-06-29T20:44:52Z
Text replace - "<code>" to "<syntaxhighlight lang="text">"

				
				
				
				
			
			← Older revision
			Revision as of 20:44, 29 June 2011
			
Line 7:
Line 7:
  For Git to work properly, it needs to store some personal information for use in email merge requests and in the commit logging.   For Git to work properly, it needs to store some personal information for use in email merge requests and in the commit logging.
    
− <code> + <syntaxhighlight lang="text">
  git config --global user.name "Your Name"   git config --global user.name "Your Name"
  git config --global user.email you@example.com   git config --global user.email you@example.com
Line 14:
Line 14:
  Additionally, to allow colorized output in Git:   Additionally, to allow colorized output in Git:
    
− <code> + <syntaxhighlight lang="text">
  git config --global color.ui true   git config --global color.ui true
  </code>   </code>
Line 22:
Line 22:
  If you experience problems with colorized output, try adding the following to your <tt>~/.bashrc</tt>   If you experience problems with colorized output, try adding the following to your <tt>~/.bashrc</tt>
    
− <code> + <syntaxhighlight lang="text">
  # R needed for git colours   # R needed for git colours
  export LESS="-RIM"   export LESS="-RIM"
Line 31:
Line 31:
  Getting started with Git for KDE is fairly easy. First, run the following:   Getting started with Git for KDE is fairly easy. First, run the following:
    
− <code> + <syntaxhighlight lang="text">
  git clone <REPOSITORY URL>   git clone <REPOSITORY URL>
  </code>   </code>
Line 41:
Line 41:
  Create a work branch (in this example, called <tt>mywork</tt>), and change to that branch:   Create a work branch (in this example, called <tt>mywork</tt>), and change to that branch:
    
− <code> + <syntaxhighlight lang="text">
  git branch mywork   git branch mywork
  git checkout mywork   git checkout mywork
Line 48:
Line 48:
  Now change into the git directory and code away. To fetch upstream changes into your local repository, switch to the master branch and run:   Now change into the git directory and code away. To fetch upstream changes into your local repository, switch to the master branch and run:
    
− <code> + <syntaxhighlight lang="text">
  git checkout master   git checkout master
  git pull --rebase   git pull --rebase
Line 55:
Line 55:
  To update another branch from master, without losing changes already committed in the branch:   To update another branch from master, without losing changes already committed in the branch:
    
− <code> + <syntaxhighlight lang="text">
  git checkout mywork   git checkout mywork
  git merge master   git merge master
Line 62:
Line 62:
  To check the status of the repository. use the <tt>status</tt> sub-command to view the state of the local copy:   To check the status of the repository. use the <tt>status</tt> sub-command to view the state of the local copy:
    
− <code> + <syntaxhighlight lang="text">
  $ git status   $ git status
  # On branch master   # On branch master
Line 77:
Line 77:
  If 'testfile' should be added to the local copy, run the <tt>add</tt> sub command:   If 'testfile' should be added to the local copy, run the <tt>add</tt> sub command:
    
− <code> + <syntaxhighlight lang="text">
  $ git add testfile   $ git add testfile
  </code>   </code>
Line 83:
Line 83:
  Once 'testfile' has all the changes desired, <tt>commit</tt> it to the local copy:   Once 'testfile' has all the changes desired, <tt>commit</tt> it to the local copy:
    
− <code> + <syntaxhighlight lang="text">
  $ git commit -m "This is the first commit"   $ git commit -m "This is the first commit"
  Created initial commit 246d7aa: This is the first commit   Created initial commit 246d7aa: This is the first commit
Line 92:
Line 92:
  Much like <tt>svn status</tt>, if you change a file once it has been committed, running <tt>git status</tt> will show that the file was modifed since last commit:   Much like <tt>svn status</tt>, if you change a file once it has been committed, running <tt>git status</tt> will show that the file was modifed since last commit:
    
− <code> + <syntaxhighlight lang="text">
  $ echo "new content" > testfile   $ echo "new content" > testfile
  $ git status   $ git status
Line 110:
Line 110:
  To push your changes in the current branch to the upstream repository:   To push your changes in the current branch to the upstream repository:
    
− <code>git push</code> + <syntaxhighlight lang="text">git push</code>
    
  == Branches and merging are cheap in Git ==   == Branches and merging are cheap in Git ==
Line 118:
Line 118:
  To view the current set of branches available, run <tt>git branch</tt>. The branch with a proceeding '*' is the active one. To create a new branch called <tt>"bugfix-branch"</tt> for example, run:   To view the current set of branches available, run <tt>git branch</tt>. The branch with a proceeding '*' is the active one. To create a new branch called <tt>"bugfix-branch"</tt> for example, run:
    
− <code> + <syntaxhighlight lang="text">
  $ git branch bugfix-branch   $ git branch bugfix-branch
  $ git checkout bugfix-branch   $ git checkout bugfix-branch
Line 125:
Line 125:
    
  There is also an alias for that   There is also an alias for that
− <code> + <syntaxhighlight lang="text">
  $ git checkout -b bugfix-branch   $ git checkout -b bugfix-branch
  Switched to a new branch "bugfix-branch"   Switched to a new branch "bugfix-branch"
Line 132:
Line 132:
  Make the necessary changes to the branch and then get ready to merge them back to the master branch   Make the necessary changes to the branch and then get ready to merge them back to the master branch
    
− <code> + <syntaxhighlight lang="text">
  $ git checkout master   $ git checkout master
  Switched to branch "master"   Switched to branch "master"
Line 155:
Line 155:
  To view the change log for a given file in the local copy, run <tt>git log <FILENAME></tt>.   To view the change log for a given file in the local copy, run <tt>git log <FILENAME></tt>.
    
− <code> + <syntaxhighlight lang="text">
  $ git log testfile   $ git log testfile
  commit 14a9802e249413003d1fa40002baa025aa54c75f   commit 14a9802e249413003d1fa40002baa025aa54c75f



Odysseus at 14:08, 1 March 2011
2011-03-01T14:08:44Z


				
				
				
				
			
			← Older revision
			Revision as of 14:08, 1 March 2011
			
Line 1:
Line 1:
  + {{warning|This page is yet to be reviewed for changes required by the migration to Git.  Information and commands on this page may no longer be valid and should be used with care. Please see the [[Development/Git|KDE Git hub page]] for more details. }}
  + 
  This tutorial will show you the basics for [http://git-scm.com/ Git].   This tutorial will show you the basics for [http://git-scm.com/ Git].
    



Djarvie: /* First steps with Git */
2011-01-04T01:07:07Z
‎First steps with Git

				
				
				
				
			
			← Older revision
			Revision as of 01:07, 4 January 2011
			
Line 47:
Line 47:
    
  <code>   <code>
− git branch master + git checkout master
  git pull --rebase   git pull --rebase
  </code>   </code>



Djarvie: /* First steps with Git */
2011-01-04T01:06:41Z
‎First steps with Git

				
				
				
				
			
			← Older revision
			Revision as of 01:06, 4 January 2011
			
Line 35:
Line 35:
  The <tt><REPOSITORY URL></tt> for the KDE-Qt repository is discussed on the  [http://techbase.kde.org/Getting_Started/Build/KDE4/Prerequisites#Qt Qt Prerequisites] wiki page.   The <tt><REPOSITORY URL></tt> for the KDE-Qt repository is discussed on the  [http://techbase.kde.org/Getting_Started/Build/KDE4/Prerequisites#Qt Qt Prerequisites] wiki page.
    
− This creates a local copy of the upstream repository. Now change into that directory and code away. When updating, run: + This creates a local copy of the upstream repository, in your local <tt>master</tt> branch. Always keep the <tt>master</tt> branch for tracking the upstream repository, and create other branches to do your work in. That way, it will be straightforward to push selected changes upstream, rather than having to push all your changes every time.
  +  
  + Create a work branch (in this example, called <tt>mywork</tt>), and change to that branch:
  +  
  + <code>
  + git branch mywork
  + git checkout mywork
  + </code>
  +  
  + Now change into the git directory and code away. To fetch upstream changes into your local repository, switch to the master branch and run:
  +  
  + <code>
  + git branch master
  + git pull --rebase
  + </code>
  +  
  + To update another branch from master, without losing changes already committed in the branch:
    
  <code>   <code>
− git pull + git checkout mywork
  + git merge master
  </code>   </code>
    
Line 88:
Line 105:
    
  After the files have been added to the staging area, <tt>git diff</tt> will not show changes to them. To check your changes before doing the commit, you can pass <tt>--cached</tt> as an option to diff to see them.   After the files have been added to the staging area, <tt>git diff</tt> will not show changes to them. To check your changes before doing the commit, you can pass <tt>--cached</tt> as an option to diff to see them.
  + 
  + To push your changes in the current branch to the upstream repository:
  + 
  + <code>git push</code>
    
  == Branches and merging are cheap in Git ==   == Branches and merging are cheap in Git ==



Bulldog98: Added the shortform for adding a branch
2010-11-16T19:11:38Z
Added the shortform for adding a branch

				
				
				
				
			
			← Older revision
			Revision as of 19:11, 16 November 2010
			
Line 99:
Line 99:
  $ git checkout bugfix-branch   $ git checkout bugfix-branch
  Switched to branch "bugfix-branch"   Switched to branch "bugfix-branch"
  + </code>
  + 
  + There is also an alias for that
  + <code>
  + $ git checkout -b bugfix-branch
  + Switched to a new branch "bugfix-branch"
  </code>   </code>
    





Rytilahti: some clarifications regarding to adding files to commit, git log -p tip
2010-03-07T21:52:46Z
some clarifications regarding to adding files to commit, git log -p tip

				
				
				
				
			
			← Older revision
			Revision as of 21:52, 7 March 2010
			
Line 84:
Line 84:
  no changes added to commit (use "git add" and/or "git commit -a")   no changes added to commit (use "git add" and/or "git commit -a")
  </code>   </code>
  + 
  + As the output states, the changes will not be added to the commit before you use <tt>git add</tt> to add the files to your staging area. The staging area is a temporary location for the changes to be commited, and it basically allows you to select what files you want to include in a commit. If you want to include all changed files to your next commit, the shortcut "-a" for commit can be used to achieve this.
  + 
  + After the files have been added to the staging area, <tt>git diff</tt> will not show changes to them. To check your changes before doing the commit, you can pass <tt>--cached</tt> as an option to diff to see them.
    
  == Branches and merging are cheap in Git ==   == Branches and merging are cheap in Git ==
Line 136:
Line 140:
       This is the first commit        This is the first commit
  </code>   </code>
  + 
  + To ease the workflow you can use <tt>git log -p</tt> to see the diffs per commit basis, instead of querying the commit hash with <tt>git log</tt> and then using <tt>git diff</tt> against that.



Unormal: /* Branches and merging are cheap in Git */ Typo
2010-01-28T08:49:31Z
‎Branches and merging are cheap in Git:  Typo

				
				
				
				
			
			← Older revision
			Revision as of 08:49, 28 January 2010
			
Line 97:
Line 97:
  </code>   </code>
    
− Make the changes necessary changes to the branch and then get ready to merge them back to the master branch + Make the necessary changes to the branch and then get ready to merge them back to the master branch
    
  <code>   <code>

← Older revision		Revision as of 14:08, 1 March 2011
Line 1:		Line 1:
		+	{{warning\|This page is yet to be reviewed for changes required by the migration to Git. Information and commands on this page may no longer be valid and should be used with care. Please see the [[Development/Git\|KDE Git hub page]] for more details. }}
		+
	This tutorial will show you the basics for [http://git-scm.com/ Git].		This tutorial will show you the basics for [http://git-scm.com/ Git].