User Tools

Site Tools


quickref:git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
quickref:git [2014/12/18 12:46]
andy Added some recipes, updated gitconfig file
quickref:git [2015/07/02 11:36] (current)
andy [Staging Files]
Line 155: Line 155:
 </​file>​ </​file>​
  
-This sample output shows **six locally modified** files, ​none of which have any unstaged ​changes. Entering **''​2''​** enters the **update** mode, and then one or more files can be selected to be staged. Files can be specified in the following ways:+This sample output shows **six locally modified** files -- for example''​README.txt''​ has six lines added and four lines removed. None of the files have any **staged ​changes** however. 
 + 
 +Entering **''​2''​** enters the **update** mode, and then one or more files can be selected to be staged. Files can be specified in at least the following ways:
  
 ^ ''​3''​ | Add a single file specified by number. | ^ ''​3''​ | Add a single file specified by number. |
Line 179: Line 181:
 What now> What now>
 </​file>​ </​file>​
 +
 +Now we can see that changes have moved from the working directory into the index for those files that we've staged. If we made further modifications to the same files before committing then we'd see change summaries in both columns, since the staged files would differ from the current HEAD and the working directory copies would also differ from the staged ones.
  
 The other options perform the following functions: The other options perform the following functions:
quickref/git.1418906770.txt.gz · Last modified: 2014/12/18 12:46 by andy