RE: [CONF] Corinthia > Git FAQ

["Dennis E. Hamilton" <de...@acm.org>]

An interesting case is with regard to non-committers who want to contribute and who are likely cloning/forking from the mirror on GitHub/Apache.
 
(I mention that because I am yet to figure out how to have Git make patch DIFFs that would actually work against the origin repository [;<).  As a committer here, I don’t have to worry about that, but I don’t know how to show anyone else how to do it either.)
 
-   Dennis
 
PS: Although our repository is not on GitHub, there are two tools that work just fine with it on Windows.  TortoiseGit works very well and is the easy way to make the original clone.  Once a clone working directory works, the GitHub for Windows utility will find it and then do coordination the same as if you had a clone from a GitHub project.  
 
PPS: The Git support in Visual Studio will also work, but Visual Studio expects to see Visual Studio Projects in the clone.  That’s not ideal but it works once CMake has been used to create them.
 
From: Gabriela Gibson (Confluence) [mailto:confluence@apache.org] 
Sent: Friday, March 13, 2015 08:09
To: orcmid@apache.org
Subject: [CONF] Corinthia > Git FAQ
 




Gabriela Gibson <https://cwiki.apache.org/%20%20%20%20https:/cwiki.apache.org/confluence/display/~gbg%20>  edited the page: 


 <https://cwiki.apache.org/confluence/display/Corinthia/Git+FAQ> Git FAQ 

Comment: Add Pro Git link. 
...
 

cd <yourRepoName> 
git co master 
git pull 
git branch -b work 
<do all your work, including several small commits> 

git commit -a -F ./your.logmessage
<continue working> 
<run dtest -plain  to ensure all test cases still work> 
  

git co master 
git merge --squash work 
git commit -a -F ../your.logmessage 
git push 
 

Additional Information

Particularly for new committers, you may find the following information useful:
*	Pro Git: Free book available as  <http://git-scm.com/book/en/v2> HTML and  <https://progit2.s3.amazonaws.com/en/2015-03-06-439c2/progit-en.376.pdf> PDF.  Also available in other languages, please see the HTML version for a list. 
*	Guide for new project committers <http://www.apache.org/dev/new-committers-guide.html>  
*	Committers FAQ <https://www.apache.org/dev/committers.html>  
*	Git at Apache <https://git-wip-us.apache.org/>  
...

View Online <https://cwiki.apache.org/confluence/display/Corinthia/Git+FAQ>  · Like <https://cwiki.apache.org/confluence/plugins/likes/like.action?contentId=50857625>  · View Changes <https://cwiki.apache.org/confluence/pages/diffpagesbyversion.action?pageId=50857625&revisedVersion=17&originalVersion=16>  · Add Comment <https://cwiki.apache.org/confluence/display/Corinthia/Git+FAQ?showComments=true&showCommentArea=true#addcomment>  
Stop watching page <https://cwiki.apache.org/confluence/users/removepagenotification.action?pageId=50857625>  · Manage Notifications <https://cwiki.apache.org/confluence/users/editmyemailsettings.action>  

This message was sent by  <http://www.atlassian.com/software/confluence> Atlassian Confluence 5.0.3,  <http://www.atlassian.com/software/confluence/overview/team-collaboration-software?utm_source=email-footer> Team Collaboration Software