Pelican Parts
Parts Catalog Accessories Catalog How To Articles Tech Forums
Call Pelican Parts at 888-280-7799
Shopping Cart Cart | Project List | Order Status | Help



Go Back   Pelican Parts Forums > Miscellaneous and Off Topic Forums > Off Topic Discussions


Reply
 
LinkBack Thread Tools Rate Thread
Author
Thread Post New Thread    Reply
Registered User
 
id10t's Avatar
 
Join Date: Mar 2003
Posts: 7,835
git gui for mac?

Anyone able to recommend a stand-alone git client for the Mac users out there? I'm happy using it via my IDE on my Linux box, and we don't have any windows machines to worry about atm. Mac users are doign HTML stuff, so I don't think they need/want a full blown IDE like NetBeans or Eclipse, they use Sublime as their editor...

Of of 'em actually asked me about using the command line to do it.... and while I love me some blinkin cursor action, I don't wanna traumatize them too much...

Thanks!
Old 08-23-2018, 03:08 AM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #1 (permalink)
Back in the saddle again
 
masraum's Avatar
 
Join Date: Oct 2001
Location: Houston, TX
Posts: 29,595
What?! You aren't demanding that they us Vi? I guess vi is just an editor and git is version control, so not really exactly the same thing. I'm relatively new at this whole scripting thing myself.

https://git-scm.com/download/gui/mac

https://www.slant.co/topics/4985/~visual-git-guis
__________________
Steve
'08 Boxster RS60 Spyder #0099/1960
- never named a car before, but this is Charlotte.
'88 targa SOLD 2004 - gone but not forgotten

Last edited by masraum; 08-23-2018 at 03:25 AM..
Old 08-23-2018, 03:22 AM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #2 (permalink)
The Unsettler
 
stomachmonkey's Avatar
 
Join Date: Dec 2002
Location: Lantanna TX
Posts: 21,038
Send a message via AIM to stomachmonkey
I use https://desktop.github.com

Some of my guys use Tower . https://www.git-tower.com/mac

For a terminal emulator check out iTerm, https://www.iterm2.com

My most frequently used editor is Brackets. Brackets - A modern, open source code editor that understands web design. .
__________________
"I want my two dollars"
"Goodbye and thanks for the fish"
"Proud Member and Supporter of the YWL"
Old 08-23-2018, 04:44 AM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #3 (permalink)
Registered User
 
peteremsley's Avatar
 
Join Date: Jan 1999
Location: denver, co
Posts: 10,337
https://www.gitkraken.com/download
Old 08-23-2018, 04:58 AM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #4 (permalink)
Slackerous Maximus
 
HardDrive's Avatar
 
Join Date: Apr 2005
Location: Columbus, OH
Posts: 16,188
Oh fer forks sake....

git pull
git commit
git paid

git from the command line is not as as intimidating as it seems, and I think devs worth their salt should really know how to cherry pick commits, resolve conflicts, rebase from the command line.
__________________
1992 Ducati Supersport. White frame, Ferracci pipes, open airbox. FOR SALE
Mercedes E350 family truckster.
2003 Mustang Mach 1
Old 08-23-2018, 07:39 PM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #5 (permalink)
Registered User
 
VincentVega's Avatar
 
Join Date: Aug 2002
Location: MD
Posts: 5,208
^

Seems like you are creating a problem looking for a gui
Old 08-23-2018, 07:41 PM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #6 (permalink)
Registered User
 
Join Date: Sep 2015
Location: NY
Posts: 959
Command line ain’t so bad in this case.
Old 08-23-2018, 07:44 PM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #7 (permalink)
Back in the saddle again
 
masraum's Avatar
 
Join Date: Oct 2001
Location: Houston, TX
Posts: 29,595
Quote:
Originally Posted by HardDrive View Post
Oh fer forks sake....

git pull
git commit
git paid

git from the command line is not as as intimidating as it seems, and I think devs worth their salt should really know how to cherry pick commits, resolve conflicts, rebase from the command line.
OK, like I said before, I'm new. I know commit, status, diff and add. What you've got listed barely intersects with my list. How about a slightly longer version?

My git is just local if it matters.
__________________
Steve
'08 Boxster RS60 Spyder #0099/1960
- never named a car before, but this is Charlotte.
'88 targa SOLD 2004 - gone but not forgotten
Old 08-23-2018, 07:50 PM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #8 (permalink)
Slackerous Maximus
 
HardDrive's Avatar
 
Join Date: Apr 2005
Location: Columbus, OH
Posts: 16,188
Quote:
Originally Posted by masraum View Post
OK, like I said before, I'm new. I know commit, status, diff and add. What you've got listed barely intersects with my list. How about a slightly longer version?

My git is just local if it matters.
I'd rather not retype the git docs here, but for some background I work on a team, and git branching rules how we work together.

There are different strategies for git branching. Our team has a single main branch we call 'Release'. Putting your stuff in the Release branch means that its ready for testing, and you intend it to go live in the next product release.

So lets suppose you want to work on a new feature, and its a big one. Your are on the Release branch, and checkout a new branch to get started:

git checkout -b my-new-feature-branch

Great. Now you and your other team members want to start working cards for the new feature, checking out tiny branches to work individual cards, and then merging them back into my-new-feature-branch. All good, except that the Release branch is still out there, and people are adding new commits to it all the time. You want to make sure you keep your feature branch up to date with Release by doing a frequent rebase. Basically you are taking all of the new commits in Release, and replaying them over the top of your branch, to ensure you are up to date.

Ah, but what if someone has merged something into release, and it conflicts with a change in your branch? This is called a merge conflict. Git will tell you were the conflicts are. You open up the code, resolve the differences, then commit the fixes.

Last one, cherry picking. Lets suppose you have a branch, and it gets really screwed up. Perhaps someone accidentally merged in a bunch of stuff, and no one notices for a long time. Now you want to merge your stuff in, and realize that the branch is wrecked. Doing a cherry pick, you can open up a fresh branch, then retrieve only the commits from your feature branch that contain the stuff you want. The new branch with only the good stuff can them be merged in. And the person who messed things can be made fun of an buy the first round after work.

Hope that helps.
__________________
1992 Ducati Supersport. White frame, Ferracci pipes, open airbox. FOR SALE
Mercedes E350 family truckster.
2003 Mustang Mach 1

Last edited by HardDrive; 08-24-2018 at 05:24 PM..
Old 08-24-2018, 05:21 PM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #9 (permalink)
Slackerous Maximus
 
HardDrive's Avatar
 
Join Date: Apr 2005
Location: Columbus, OH
Posts: 16,188
I am OH SO not a git guru, but a bit of advice is to commit frequently. Not every new method you created, but don't type all day them commit. Having frequent commits means that if something goes wrong, you can get yourself back to a very specific point in time before things went off the rails. You can't do that if you type for 8 hours and commit it as one big blob at the end of the day.
__________________
1992 Ducati Supersport. White frame, Ferracci pipes, open airbox. FOR SALE
Mercedes E350 family truckster.
2003 Mustang Mach 1
Old 08-24-2018, 05:28 PM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #10 (permalink)
Back in the saddle again
 
masraum's Avatar
 
Join Date: Oct 2001
Location: Houston, TX
Posts: 29,595
Good stuff, thanks for the info.
__________________
Steve
'08 Boxster RS60 Spyder #0099/1960
- never named a car before, but this is Charlotte.
'88 targa SOLD 2004 - gone but not forgotten
Old 08-24-2018, 07:15 PM
  Pelican Parts Catalog | Tech Articles | Promos & Specials    Reply With Quote #11 (permalink)
Reply

Thread Tools
Rate This Thread
Rate This Thread:

 


All times are GMT -8. The time now is 07:09 PM.


 
Powered by vBulletin® Version 3.8.7
Copyright ©2000 - 2018, vBulletin Solutions, Inc.
Search Engine Optimization by vBSEO 3.6.0
Copyright 2018 Pelican Parts, LLC - Posts may be archived for display on the Pelican Parts Website -    DMCA Registered Agent Contact Page
 

DTO Garage Plus vBulletin Plugins by Drive Thru Online, Inc.