Page 1 of 2

How do I go about using Git?

Posted: Sun Aug 30, 2020 10:04 pm
by cubebert
The title says it all, basically. I have a GitHub account and I haven't really done anything with it for a couple of years, but I wanted to try my hand at analyzing a source port for Doom and making my own port. In short, I was thinking of using Chocolate Doom and as a base and tweaking it to fit my tastes, but I don't have any experience with using Git or Github. I've recently installed Git on my computer and created a repository, but I'm stuck on the next step of figuring out what I should do.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 12:40 am
by Graf Zahl
What operating system do you use? As a beginner you should consider using a GUI-based git client, but the recommendations are very different, based on what you are on.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 4:07 am
by cubebert
I'm dual-booting Windows 7 and Zorin OS on my computer, but I'm mostly on Windows. As for a GUI, I'm using Git Extensions because it's compatible with both of my operating systems.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 5:05 am
by Dancso
I use TortoiseGit, works like a charm for me

Never understood the obsession with people typing away in terminal for git, seems like an excuse to feel like a "HACKERMAN".
Do let me know if there are any particular reasons (beside some gui apps being really crappy), I only occasionally use git so maybe there's an issue I haven't come across yet, I just don't like the idea of spelling out paths and having to correct typos in my commands. I also like seeing a list of what I'm about to commit too.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 5:34 am
by drfrag
viewtopic.php?f=4&t=69494
viewtopic.php?f=12&t=69590

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 6:07 am
by Graf Zahl
Dancso wrote: Never understood the obsession with people typing away in terminal for git, seems like an excuse to feel like a "HACKERMAN".
Do let me know if there are any particular reasons (beside some gui apps being really crappy), I only occasionally use git so maybe there's an issue I haven't come across yet, I just don't like the idea of spelling out paths and having to correct typos in my commands. I also like seeing a list of what I'm about to commit too.
People use the command line because for simple jobs it is a lot faster, if you know what to type.
Where it gets ridiculous is when you need to do something more complex, like cherry picking commits from another branch or investigate changes between revisions.
For that a *good* GUI tool is almost essential - but few are good. I like TortoiseGit most because it's so straightforward - you can right-click anywhere and get a meaningful context menu.

At work on a Mac I have to use Git Tower and aside from being ridiculously expensive its UX is also crap.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 6:10 am
by Graf Zahl
cubebert wrote:I'm dual-booting Windows 7 and Zorin OS on my computer, but I'm mostly on Windows. As for a GUI, I'm using Git Extensions because it's compatible with both of my operating systems.

Ok, so you are already past the first step. As a next step you have to make a clone of the repo you want to work on, i.e. get a link to the repo and then open the clone menu in Git Extensions. After that it should all check out.
After that comes the tricky part - getting the project to run. I don't know what Chocolate Doom needs so this may be easy or not. Somebody else will have to give you hints with that.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 7:43 am
by cubebert
Graf Zahl wrote:Ok, so you are already past the first step. As a next step you have to make a clone of the repo you want to work on, i.e. get a link to the repo and then open the clone menu in Git Extensions. After that it should all check out.
After that comes the tricky part - getting the project to run. I don't know what Chocolate Doom needs so this may be easy or not. Somebody else will have to give you hints with that.
Alright, I'll try to make a clone of the repository later and see how to get it to run. Thanks for helping me out with this; I'm very new to Git and I wanted to learn more about compiling and developing various source ports. I'll post on this thread if I need any more help or to give updates about my cloned repo.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 8:14 am
by drfrag
Use CMake GUI to generate the projects for your compiler.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 5:18 pm
by SanyaWaffles
I can understand how confusing Git is. While it is superior to SVN in every way, it is also more complex and sometimes it bites me in the ass. My main thing with git that I still haven't been able to figure out is how to format messages so they look nice and neat. Is it Markdown? I've never seen anything on that.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 5:20 pm
by Rachael
Dancso wrote:I use TortoiseGit, works like a charm for me

Never understood the obsession with people typing away in terminal for git, seems like an excuse to feel like a "HACKERMAN".
Do let me know if there are any particular reasons (beside some gui apps being really crappy), I only occasionally use git so maybe there's an issue I haven't come across yet, I just don't like the idea of spelling out paths and having to correct typos in my commands. I also like seeing a list of what I'm about to commit too.
Excuse me, but there is no obsession with typing away on a terminal to feel like a "HACKERMAN".

Graf already stated why people do it, and I am no exception - some things are just faster on a command-line. GUI's are good but they can only help you to some extent - when you want to work efficiently, you use your language skills just as you would when talking to someone.

I do not use Git on the command-line exclusively - I know *how* to do it, I can even resolve commits on the command-line, but I prefer using the GUI for those. For literally everything else, the command-line just makes work so much faster and more efficient. And truth be told - the GUI does that for merge conflicts, too. So that's really what it's all about - efficiency, and ease.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 5:21 pm
by Rachael
SanyaWaffles wrote:I can understand how confusing Git is. While it is superior to SVN in every way, it is also more complex and sometimes it bites me in the ass. My main thing with git that I still haven't been able to figure out is how to format messages so they look nice and neat. Is it Markdown? I've never seen anything on that.
Github uses markdown, but not Git in general. But yes - if you use markdown in your commit messages, Github will "pretty" them.

Re: How do I go about using Git?

Posted: Mon Aug 31, 2020 5:27 pm
by SanyaWaffles
On the subject of using the command line, I for one use a mix of both the GUI and the command line. I actually wrote my own batch script which fetches the hash and commit count and puts it into my project. I do like using the command line, but sometimes I prefer using a GUI. Depends on the mood I'm in and what I'm trying to accomplish. Also DD1 and DD2's build environment is 7zip batch scripts (could be ported to Linux, I think I did that at one point, but not being on a Linux box I can't test them reliably). They all have a use. I feel shaming people for whatever gets the job done is... kind of counter productive and certainly doesn't help in the long run.
Rachael wrote:Github uses markdown, but not Git in general. But yes - if you use markdown in your commit messages, Github will "pretty" them.
That's good to know. I'll try to keep that in mind as I feel paragraph soup is probably not the best way to format long ass winded Git messages.

Re: How do I go about using Git?

Posted: Tue Sep 01, 2020 6:47 pm
by NeuralStunner
Personally, I like mercurial better... Branches and PRs just feel a lot simpler. But it gets no support because it isn't as popular.

Bitbucket was always nice for its hg support. Guess what they dropped recently? :(

Re: How do I go about using Git?

Posted: Mon Sep 07, 2020 8:17 pm
by cubebert
I'd like to share a couple of things about my repository. First, I've changed a few files so that the static limits matched Doom-plus' values and I'm about halfway ready to share it, but I don't know how to do so. Is there a way to publicize my repository on my GitHub account or do I have to do it on Git Extensions? Secondly, since I looked at Crispy Doom's source code to learn how to disable savegame limitations, I think I should give credit to Fabian Greffrath, the author of the port. Is it as simple as putting it on the readme file or is there something else I need to do?