Skip to content
This repository has been archived by the owner on Jan 3, 2018. It is now read-only.

Incorporating many of @wking's changes (but not all); still unsure what to say about -u #191

Merged
merged 3 commits into from
Dec 7, 2013
Merged

Incorporating many of @wking's changes (but not all); still unsure what to say about -u #191

merged 3 commits into from
Dec 7, 2013

Conversation

gvwilson
Copy link
Contributor

@gvwilson gvwilson commented Dec 3, 2013

Incorporating many of the changes recommended by @wking, but still unsure how to discuss the -u flag to git push. If we create a new repository on GitHub without a license or README, GitHub's own instructions are to:

touch README.md
git init
git add README.md
git commit -m "first commit"
git remote add origin git@github.com:gvwilson/no-initial-files.git
git push -u origin master

or to:

git remote add origin git@github.com:gvwilson/no-initial-files.git
git push -u origin master

How do we explain (or explain away) the use of -u in this case when it isn't needed to clone an existing repository that has files?

unsure how to discuss the `-u` flag to `git push`.  If we create a new
repository on GitHub *without* a license or README, GitHub's own
instructions are to:

    touch README.md
    git init
    git add README.md
    git commit -m "first commit"
    git remote add origin git@github.com:gvwilson/no-initial-files.git
    git push -u origin master

or to:

    git remote add origin git@github.com:gvwilson/no-initial-files.git
    git push -u origin master

How do we explain (or explain away) the use of `-u` in this case when
it isn't needed to clone an existing repository that has files?
@wking
Copy link
Contributor

wking commented Dec 6, 2013

On Tue, Dec 03, 2013 at 06:38:48AM -0800, Greg Wilson wrote:

Incorporating many of the changes recommended by @wking

Why did we start a new PR here instead of discussing in #185 and #187?

I'm not , but still unsure how to discuss the -u flag to git push. If we create a new repository on GitHub without a license
or README, GitHub's own instructions are to:

git push -u origin master

How do we explain (or explain away) the use of -u in this case
when it isn't needed to clone an existing repository that has files?

If I mentioned -u at all, I'd say:

“You may see a -u option used for pushes, which tells Git to record
a default upstream for the branch you're pushing. That can be useful,
but we don't have time to get into the details here. If you're
curious, read git-push(1). If you copy/paste a push -u, don't
worry, it won't effect the workflow we're presenting.”

@gvwilson
Copy link
Contributor Author

gvwilson commented Dec 6, 2013

If I mentioned -u at all, I'd say:

“You may see a -u option used for pushes, which tells Git to record
a default upstream for the branch you're pushing. That can be useful,
but we don't have time to get into the details here. If you're
curious, read git-push(1). If you copy/paste a push -u, don't
worry, it won't effect the workflow we're presenting.”
Sold --- I'll push the change, then merge.
Thx,
G

@wking
Copy link
Contributor

wking commented Dec 6, 2013

On Fri, Dec 06, 2013 at 12:56:18PM -0800, Greg Wilson wrote:

I'll push the change, then merge.

I'm still not sold on the consolidation from 21 individually-motivated
commits in #185 and #187 to the two commits in #191. I'm also not
sure which of my recommended changes made it into this PR, and which
were rejected (or why they were rejected). It's nice that you mention
me in your commit messages, but I'm more interested in recording the
motivation for the changes in any commits that land in the master
branch.

gvwilson pushed a commit that referenced this pull request Dec 7, 2013
Incorporating many of @wking's changes (but not all); still unsure what to say about `-u`
@gvwilson gvwilson merged commit 6736926 into swcarpentry:master Dec 7, 2013
@gvwilson gvwilson deleted the incorporating-wking-edits branch December 7, 2013 00:48
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants