Return-Path: X-Original-To: apmail-corinthia-dev-archive@minotaur.apache.org Delivered-To: apmail-corinthia-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 44AF017F0C for ; Fri, 13 Mar 2015 15:56:19 +0000 (UTC) Received: (qmail 82453 invoked by uid 500); 13 Mar 2015 15:56:19 -0000 Delivered-To: apmail-corinthia-dev-archive@corinthia.apache.org Received: (qmail 82425 invoked by uid 500); 13 Mar 2015 15:56:19 -0000 Mailing-List: contact dev-help@corinthia.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@corinthia.incubator.apache.org Delivered-To: mailing list dev@corinthia.incubator.apache.org Received: (qmail 82414 invoked by uid 99); 13 Mar 2015 15:56:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Mar 2015 15:56:18 +0000 X-ASF-Spam-Status: No, hits=4.8 required=5.0 tests=HTML_FONT_SIZE_LARGE,HTML_MESSAGE,HTTP_ESCAPED_HOST,SPF_SOFTFAIL X-Spam-Check-By: apache.org Received-SPF: softfail (nike.apache.org: transitioning domain of dennis.hamilton@acm.org does not designate 216.234.124.51 as permitted sender) Received: from [216.234.124.51] (HELO barracuda.supercp.com) (216.234.124.51) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Mar 2015 15:55:52 +0000 X-ASG-Debug-ID: 1426262147-0798da1d4e47289a0001-KCmPzH Received: from a2s42.a2hosting.com (a2s42.a2hosting.com [216.119.133.2]) by barracuda.supercp.com with ESMTP id 6uzLN8ugbCiWj8Qu for ; Fri, 13 Mar 2015 11:55:47 -0400 (EDT) X-Barracuda-Envelope-From: dennis.hamilton@acm.org X-Barracuda-Apparent-Source-IP: 216.119.133.2 Received: from 75-165-123-152.tukw.qwest.net ([75.165.123.152]:52951 helo=Astraendo2) by a2s42.a2hosting.com with esmtpa (Exim 4.82) (envelope-from ) id 1YWRw9-000tZp-Fr for dev@corinthia.incubator.apache.org; Fri, 13 Mar 2015 11:55:47 -0400 Reply-To: From: "Dennis E. Hamilton" To: References: <110453828.50964.1426259340153.JavaMail.confluence@cwiki-vm> In-Reply-To: <110453828.50964.1426259340153.JavaMail.confluence@cwiki-vm> Subject: RE: [CONF] Corinthia > Git FAQ Date: Fri, 13 Mar 2015 08:55:45 -0700 X-ASG-Orig-Subj: RE: [CONF] Corinthia > Git FAQ Organization: NuovoDoc Message-ID: <00c101d05da6$2be61e40$83b25ac0$@acm.org> MIME-Version: 1.0 Content-Type: multipart/related; boundary="----=_NextPart_000_00C2_01D05D6B.7F8E4B20" X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQJx8nD+0PviuFsGaBGirGW7noZ/fZvXW8zA Content-Language: en-us X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - a2s42.a2hosting.com X-AntiAbuse: Original Domain - corinthia.incubator.apache.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - acm.org X-Get-Message-Sender-Via: a2s42.a2hosting.com: authenticated_id: himself+orcmid.com/only user confirmed/virtual account not confirmed X-Barracuda-Connect: a2s42.a2hosting.com[216.119.133.2] X-Barracuda-Start-Time: 1426262147 X-Barracuda-URL: https://216.234.124.51:443/cgi-mod/mark.cgi Received-SPF: softfail (supercp.com: domain of transitioning dennis.hamilton@acm.org does not designate 75.165.123.152 as permitted sender) X-Virus-Scanned: by bsmtpd at supercp.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=4.0 KILL_LEVEL=5.0 tests=BSF_SPF_SOFTFAIL, HTML_FONT_SIZE_LARGE, HTML_MESSAGE, HTTP_ESCAPED_HOST X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.16619 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 HTTP_ESCAPED_HOST URI: Uses %-escapes inside a URL's hostname 0.00 HTML_FONT_SIZE_LARGE BODY: HTML font size is large 0.00 HTML_MESSAGE BODY: HTML included in message 0.00 BSF_SPF_SOFTFAIL Custom Rule SPF Softfail X-Virus-Checked: Checked by ClamAV on apache.org ------=_NextPart_000_00C2_01D05D6B.7F8E4B20 Content-Type: multipart/alternative; boundary="----=_NextPart_001_00C3_01D05D6B.7F8E4B20" ------=_NextPart_001_00C3_01D05D6B.7F8E4B20 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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. =20 (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=E2=80=99t have to worry about that, but I = don=E2=80=99t know how to show anyone else how to do it either.) =20 - Dennis =20 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. =20 =20 PPS: The Git support in Visual Studio will also work, but Visual Studio = expects to see Visual Studio Projects in the clone. That=E2=80=99s not = ideal but it works once CMake has been used to create them. =20 From: Gabriela Gibson (Confluence) [mailto:confluence@apache.org]=20 Sent: Friday, March 13, 2015 08:09 To: orcmid@apache.org Subject: [CONF] Corinthia > Git FAQ =20 Gabriela Gibson = edited the page:=20 Git FAQ = Comment: Add Pro Git link.=20 ... =20 cd =20 git co master=20 git pull=20 git branch -b work=20 =20 git commit -a -F ./your.logmessage =20 =20 =20 git co master=20 git merge --squash work=20 git commit -a -F ../your.logmessage=20 git push=20 =20 Additional Information Particularly for new committers, you may find the following information = useful: * Pro Git: Free book available as HTML = and = = PDF. Also available in other languages, please see the HTML version for = a list.=20 * Guide for new project committers = =20 * Committers FAQ =20 * Git at Apache =20 ... View Online = =C2=B7 = Like = =C2=B7 View Changes = =C2=B7 Add = Comment = =20 Stop watching page = =C2=B7 Manage Notifications = =20 This message was sent by = Atlassian Confluence 5.0.3, = Team Collaboration Software=20 =20 ------=_NextPart_001_00C3_01D05D6B.7F8E4B20 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

A= n interesting case is with regard to non-committers who want to = contribute and who are likely cloning/forking from the mirror on = GitHub/Apache.

<= o:p> 

(= 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 [;<). = =C2=A0As a committer here, I = don=E2=80=99t have to worry about that, but I don=E2=80=99t know how to = show anyone else how to do it either.)

<= o:p> 

-   = D= ennis

<= o:p> 

P= S: Although our repository is not on GitHub, there are two tools that = work just fine with it on Windows.=C2=A0 TortoiseGit works very well and = is the easy way to make the original clone.=C2=A0 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.=C2=A0

<= o:p> 

P= PS: The Git support in Visual Studio will also work, but Visual Studio = expects to see Visual Studio Projects in the clone.=C2=A0 That=E2=80=99s not ideal but it = works once CMake has been used to create = them.

<= o:p> 

From: Gabriela Gibson (Confluence) = [mailto:confluence@apache.org]
Sent: Friday, March 13, 2015 = 08:09
To: = orcmid@apache.org
Subject: [CONF] Corinthia > Git = FAQ

 

<= /td>

G= abriela Gibson edited the page: =

Git = FAQ =

Comment: Add Pro Git link. =

...<= /span>

 

cd <yourRepoName> =

git co master =

git pull =

git branch -b work =

<= em><do all = your work, including several small = commits> =

<continue = working>

<run dtest = -plain  to ensure all test cases = still work> =

  =

git commit -a -F = ./your.logmessage

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:

...<= /span>

Vi= ew Online =C2=B7 Like =C2=B7 = Vi= ew Changes =C2=B7 Add Comment =

Stop watching page = =C2=B7 Manage Notifications =

<= /div>

 

------=_NextPart_001_00C3_01D05D6B.7F8E4B20-- ------=_NextPart_000_00C2_01D05D6B.7F8E4B20--