accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject svn commit: r1609270 - /accumulo/site/trunk/content/source.mdtext
Date Wed, 09 Jul 2014 19:15:57 GMT
Author: busbey
Date: Wed Jul  9 19:15:56 2014
New Revision: 1609270

URL: http://svn.apache.org/r1609270
Log:
docs changes for ACCUMULO-2927

Modified:
    accumulo/site/trunk/content/source.mdtext

Modified: accumulo/site/trunk/content/source.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/source.mdtext?rev=1609270&r1=1609269&r2=1609270&view=diff
==============================================================================
--- accumulo/site/trunk/content/source.mdtext (original)
+++ accumulo/site/trunk/content/source.mdtext Wed Jul  9 19:15:56 2014
@@ -80,11 +80,33 @@ If you regularly switch between major de
 
 The easiest fix is to ensure all of your current changes are stored in git and then cleaning
your workspace.
 
-    git add path/to/file/that/has/changed
-    git add path/to/other/file
-    git clean -xdf
-
-Note that this git clean command will delete any files unknown to git in a way that is irreversible.
This includes files and directories created by IDEs in the workspace, even if git is normally
configured to ignore them.
+    $> git add path/to/file/that/has/changed
+    $> git add path/to/other/file
+    $> git clean -df
+
+Note that this git clean command will delete any files unknown to git in a way that is irreversible.
You should check that no important files will be included by first looking at the "untracked
files" section in a ```git status``` command.
+
+    $> git status
+    # On branch master
+    nothing to commit (working directory clean)
+    $> mvn package
+    { maven output elided }
+    $> git checkout 1.6.1-SNAPSHOT
+    Switched to branch '1.6.1-SNAPSHOT'
+    $> git status
+    # On branch 1.6.1-SNAPSHOT
+    # Untracked files:
+    #   (use "git add <file>..." to include in what will be committed)
+    #
+    #	mapreduce/
+    #	shell/
+    nothing added to commit but untracked files present (use "git add" to track)
+    $> git clean -df
+    Removing mapreduce/
+    Removing shell/
+    $> git status
+    # On branch 1.6.1-SNAPSHOT
+    nothing to commit (working directory clean)
 
 ### Continuous Integration
 



Mime
View raw message