Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Jan 17, 2021. It is now read-only.
/sshcodePublic archive

Solves proxy issue, closes #74 when proxy is set at .profile#121

Merged
deansheather merged 2 commits intocoder:masterfromeargollo:proxy-support
Jun 27, 2019

Conversation

eargollo
Copy link
Contributor

No description provided.

@eargolloeargollo mentioned this pull requestJun 18, 2019
Copy link
Member

@deansheatherdeansheather left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

LGTM, but we can't merge this until you set proper git user details and sign the commit with PGP.

git config --global user.name "name"git config --global user.email "email"

@eargollo
Copy link
ContributorAuthor

Weird. This is my .gitconfig:

$ cat ~/.gitconfig[core]        autocrlf = false        eol = lf[user]        name = Eduardo Argollo        email = eduardo@hp.com[alias]        aliases = config --get-regexp alias        s = status -s        psu = push --set-upstream        lg=log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative

What should I do? Create another branch, push the code again and do a new PR?

Thanks.

@deansheather
Copy link
Member

You can amend the commit and then force push to your branch.

@eargollo
Copy link
ContributorAuthor

eargollo commentedJun 24, 2019•
edited
Loading

Just did that.

$ git commit --amend --author="Eduardo Argollo <eduardo@argollo.com>"$ git push -u proxy-support -f$ git logcommit 43c4094557c34299294625abd4d92131ddd02a07 (HEAD -> proxy-support, origin/proxy-support)Author: Eduardo Argollo <eduardo@argollo.com>Date:   Mon Jun 17 20:36:49 2019 -0700    Solves proxy issue, closes #74 when proxy is set at .profile configurationcommit 5bbc39f0ddc5a7f15a75a699a2b04562b1cb0bd3 (upstream/master, master)Merge: f8ccd3a 4195d99Author: Dean Sheather <dean@deansheather.com>Date:   Wed Jun 5 17:17:03 2019 +1000    Merge pull request #114 from loverdos/portable_bash    Use bash in a more portable way

Let me know if that worked out.

Tks

@deansheather
Copy link
Member

Just needs to be signed with PGP now. You can amend and sign withgit commit --amend -S once you've setup a PGP key and added it to your GitHub account.

@eargollo
Copy link
ContributorAuthor

Done. First time I use gpg on a git commit. Thanks for the patience.

@deansheatherdeansheather merged commitc637d40 intocoder:masterJun 27, 2019
@deansheather
Copy link
Member

Thank you for this PR. 😃

@deansheather
Copy link
Member

deansheather commentedJul 26, 2019•
edited
Loading

@eargollo Could you reopen your changes on PR#118 for Windows support? Oops, forgot you've already done it in#124.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.

Reviewers

1 more reviewer

@deansheatherdeansheatherdeansheather approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@eargollo@deansheather
[8]ページ先頭
©2009-2025 Movatter.jp