<div dir="ltr">+1 for SmartGit, good for browsing the commit log, resolving conflicts or staging code chunks in an editable 3-pane view.<div>Though I would fall back to the usual cli for everything else.<div><br></div><div>GitKraken also looks interesting, but I haven't used it enough to evaluate it properly.</div><div><br></div><div>IMHO explorer integration is overrated and causes too much slow down & instability.</div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jun 3, 2016 at 5:06 AM, Colin LeMahieu via llvm-dev <span dir="ltr"><<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div bgcolor="white" lang="EN-US" link="blue" vlink="purple"><div><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">I’ve had great success with SmartGit. Since it’s java based it also works on the big-three of platforms.<u></u><u></u></span></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"><u></u> <u></u></span></p><div><div style="border:none;border-top:solid #e1e1e1 1.0pt;padding:3.0pt 0in 0in 0in"><p class="MsoNormal"><b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:windowtext">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:windowtext"> llvm-dev [mailto:<a href="mailto:llvm-dev-bounces@lists.llvm.org" target="_blank">llvm-dev-bounces@lists.llvm.org</a>] <b>On Behalf Of </b>Craig, Ben via llvm-dev<br><b>Sent:</b> Thursday, June 02, 2016 2:28 PM</span></p><div><div class="h5"><br><b>To:</b> <a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br><b>Subject:</b> Re: [llvm-dev] Switching to git (Windows experience) (was re:[cfe-dev] GitHub anyone?)<u></u><u></u></div></div><p></p></div></div><div><div class="h5"><p class="MsoNormal"><u></u> <u></u></p><p>One of the things that may taint my prior analysis...<u></u><u></u></p><p>At the time I was last evaluating Windows git GUIs, I was looking for something that would make handling .patch and .diff files easier. In particular, if a patch didn't apply, I really wanted to get some visual indication of which hunk failed, and some interface to resolve the conflict. I didn't find any tools that handled that well. Most tools didn't even expose 'git apply' in the UI at all.<u></u><u></u></p><p>If .patch file workflows aren't expected to be the norm for llvm, then that feature isn't terribly important. SourceTree may be a fine tool in that world.<u></u><u></u></p><div><p class="MsoNormal">On 6/2/2016 12:50 PM, Robinson, Paul via llvm-dev wrote:<u></u><u></u></p></div><blockquote style="margin-top:5.0pt;margin-bottom:5.0pt"><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">We switched from SVN to git internally some time ago. I polled our team in this morning's meeting. Some people who habitually work on Windows are using things like Sourcetree or gitk for browsing, but we're generally doing the "real" work from the command line.</span><u></u><u></u></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d">--paulr</span><u></u><u></u></p><p class="MsoNormal"><a name="m_-4774494601995476301__MailEndCompose"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1f497d"> </span></a><u></u><u></u></p><div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt"><div><div style="border:none;border-top:solid #b5c4df 1.0pt;padding:3.0pt 0in 0in 0in"><p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif;color:windowtext">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma",sans-serif;color:windowtext"> llvm-dev [<a href="mailto:llvm-dev-bounces@lists.llvm.org" target="_blank">mailto:llvm-dev-bounces@lists.llvm.org</a>] <b>On Behalf Of </b>Chris Ray via llvm-dev<br><b>Sent:</b> Thursday, June 02, 2016 9:05 AM<br><b>To:</b> <a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br><b>Subject:</b> Re: [llvm-dev] Switching to git (Windows experience) (was re:[cfe-dev] GitHub anyone?)</span><u></u><u></u></p></div></div><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:windowtext">Sourcetree is pretty good on windows, and I hear ok things about Git Extensions. I have not used the GitHub app though.</span><u></u><u></u></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:windowtext"> </span><u></u><u></u></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:windowtext">I typically use Sourcetree to view the logs, and command line for everything else.</span><u></u><u></u></p><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:windowtext"> </span><u></u><u></u></p><div><div style="border:none;border-top:solid #e1e1e1 1.0pt;padding:3.0pt 0in 0in 0in"><p class="MsoNormal"><b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:windowtext">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:windowtext"> llvm-dev [<a href="mailto:llvm-dev-bounces@lists.llvm.org" target="_blank">mailto:llvm-dev-bounces@lists.llvm.org</a>] <b>On Behalf Of </b>Craig, Ben via llvm-dev<br><b>Sent:</b> Thursday, June 02, 2016 10:01 AM<br><b>To:</b> <a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br><b>Subject:</b> Re: [llvm-dev] Switching to git (Windows experience) (was re:[cfe-dev] GitHub anyone?)</span><u></u><u></u></p></div></div><p class="MsoNormal"> <u></u><u></u></p><p>The GitHub app is ok. Not great, but ok. I guess this is one point in favor of GitHub vs. other git providers. As a maintainer on a different project, I still had to jump out to the command line pretty frequently, as we had a squashed pull-request work flow.<u></u><u></u></p><p>I did not have much success with git plugins for Visual Studio. They seemed to be tuned towards in-tree builds. I didn't spend enough time to figure out how to get them to work with out-of-tree builds. More specifically, I recall that Visual Studio really expected the project and solution to be in source control, and in the same directory hierarchy as the source. It's been a year since I've messed with them though, so things might have gotten better.<u></u><u></u></p><div><p class="MsoNormal">On 6/2/2016 7:43 AM, Aaron Ballman via llvm-dev wrote:<u></u><u></u></p></div><blockquote style="margin-top:5.0pt;margin-bottom:5.0pt"><pre>On Wed, Jun 1, 2016 at 6:31 PM, Renato Golin <a href="mailto:renato.golin@linaro.org" target="_blank"><renato.golin@linaro.org></a> wrote:<u></u><u></u></pre><blockquote style="margin-top:5.0pt;margin-bottom:5.0pt"><pre>I think we should start two other threads: one about git tooling on Windows<u></u><u></u></pre><pre>and one about infrastructure problems migrating to git.<u></u><u></u></pre></blockquote><pre> <u></u><u></u></pre><pre>Some developers on Windows prefer to use GUI tools like TortoiseSVN to<u></u><u></u></pre><pre>command line tools for version control. The last time I tried<u></u><u></u></pre><pre>TortoiseGit on Windows (which was over a year ago), it did not feel<u></u><u></u></pre><pre>ready for production use on a complex project to me (I had crashes on<u></u><u></u></pre><pre>simple operations, and it seems I was not alone in seeing flaky<u></u><u></u></pre><pre>behavior: <a href="https://gitlab.com/tortoisegit/tortoisegit/issues/1738" target="_blank">https://gitlab.com/tortoisegit/tortoisegit/issues/1738</a> and<u></u><u></u></pre><pre><a href="https://gitlab.com/tortoisegit/tortoisegit/issues/2494" target="_blank">https://gitlab.com/tortoisegit/tortoisegit/issues/2494</a> as examples).<u></u><u></u></pre><pre> <u></u><u></u></pre><pre>Are there suitable GUI tools for git on Windows for projects as<u></u><u></u></pre><pre>complex as LLVM? I believe MSVC has some integration, but I've not<u></u><u></u></pre><pre>used it before. Perhaps other tools exist that match the integration<u></u><u></u></pre><pre>and stability that TortoiseSVN has with Explorer?<u></u><u></u></pre><pre> <u></u><u></u></pre><pre>I bring this up as a possible minor concern because asking people to<u></u><u></u></pre><pre>switch from one set of command line commands to another set of command<u></u><u></u></pre><pre>line commands is a different beast than asking people to switch from<u></u><u></u></pre><pre>Explorer-integrated menus and dialogs to the command line (that's a<u></u><u></u></pre><pre>drastically different workflow to achieve the same end result of<u></u><u></u></pre><pre>source code version control).<u></u><u></u></pre><pre> <u></u><u></u></pre><pre>~Aaron<u></u><u></u></pre><pre>_______________________________________________<u></u><u></u></pre><pre>LLVM Developers mailing list<u></u><u></u></pre><pre><a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><u></u><u></u></pre><pre><a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><u></u><u></u></pre></blockquote><p class="MsoNormal" style="margin-bottom:12.0pt"> <u></u><u></u></p><pre>-- <u></u><u></u></pre><pre>Employee of Qualcomm Innovation Center, Inc.<u></u><u></u></pre><pre>Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project<u></u><u></u></pre></div><p class="MsoNormal"><br><br><br><u></u><u></u></p><pre>_______________________________________________<u></u><u></u></pre><pre>LLVM Developers mailing list<u></u><u></u></pre><pre><a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><u></u><u></u></pre><pre><a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><u></u><u></u></pre></blockquote><p class="MsoNormal"><br><br><u></u><u></u></p><pre>-- <u></u><u></u></pre><pre>Employee of Qualcomm Innovation Center, Inc.<u></u><u></u></pre><pre>Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project<u></u><u></u></pre></div></div></div></div><br>_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><br>
<br></blockquote></div><br></div>