Force text color in ins/del blocks to black so they play fair with dark themes

[pauljherring]

No description provided.

[BenLubar]

I suggest you base your pull requests on a clean boomzillawtf/master or the commit log is going to get gigantic.

[pauljherring]

Yesh, figured it was something like that - it's the first time I've used
git in anger and still learning.

Any pointers/sites/tutorials with regard to that specific issue?

On Fri, Jun 10, 2016 at 3:31 PM, Ben Lubar notifications@github.com wrote:

I suggest you base your pull requests on a clean boomzillawtf/master or
the commit log is going to get gigantic.

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#9 (comment), or mute
the thread
https://github.com/notifications/unsubscribe/ADweLlxhAYsO7r7KYeXe9zKdoSpnzKAaks5qKXVBgaJpZM4IzAJF
.

PJH

[BenLubar]

Assuming you don't have anything important on the master branch,

git checkout master
git fetch boomzillawtf
git reset --hard boomzillawtf/master

will get you a clean working copy of the upstream master branch.

If you haven't committed anything to your local master branch,

git checkout master
git pull boomzillawtf master

will do the same thing in a less destructive way if you miss one of the commands.

I'm not sure how you are making the branches for your pull requests, but I tend to do:

# from the master branch
git checkout -b ins-del
# make changes
git add -p .
# accept or deny each change you made
git commit -m 'some descriptive message'
git push -u BenLubar ins-del
# and then make the pull request using the button on GitHub.

[pauljherring]

git checkout master git fetch boomzillawtf

fatal: 'boomzillawtf' does not appear to be a git repository

I'm not sure how you are making the branches for your pull requests

git checkout master
git branch issue_7
git checkout issue_7
git push --set-upstream origin issue_7

<changes>

git add <individual files>
git commit -m "#7: blah"
git push

Generate pull request boomzilla <- issue_7

[boomzillawtf]

The boomzillawtf in git fetch boomzillawtf is a remote repository. To see what you have:

git remote -v

You can add others by git remote add (see the man pages for details). Usually the place you first cloned from is named origin (in this case presumably your fork of this repo) and you'd need to add others.

A common convention would be something like:

git remote add upstream https://github.com/boomzillawtf/tdwtf

So then you would do git fetch upstream. But you can, of course, name it whatever you want. I like the upstream convention with githubs forks because it standardizes the process a bit across different repos.