How to diff two local repositories
There's a diff parameter --no-index designed especially for this case git diff [options] [--no-index] [--] <path> <path> Also it can be done with --work-tree parameter. It tells Git to use a different working tree (but the same repository). cd path/to/project1 git --work-tree=path/to/project2 diff [options] The output may be large and...
git branch - local or what?
The problem was in this command: git checkout -b origin/master_next This command created a new branch origin/master_next instead of checking out the branch master_next that was created remotely. What you should have done: git fetch origin git checkout master_next git branch The git checkout branch_name command with -b creates a...
Contributing to open source project on github
You commit to your local repository; in order for your changes to appear on github, you need to git push them.
Trying to understand git upstream branch
You are mixing up two different concepts of git here. The remote and the branch. Remote [default: origin] Think of the Remote as another computer or another person. Specifying something like origin will tell git who to send your current set of changes to. Branch [default: master] You use branches...
Messed up a merge when trying to upgrade my Laravel application
When you did the git reset --soft HEAD~1, you "moved backwards" a commit, while keeping your working directory and index the same. So when you committed, the files were changed as if you had done the merge, without doing an actual merge; i.e., your commit had only one parent. I'm...
Git diff cached does nothing
Running git diff --cached will show you the difference between the repository and the index (the place where files are staged by git add before they are committed to the repository). It does not look at files in your working directory, nor does it compare differences between revisions in the...
How to release binaries on Github for different plattforms as seperate downloads?
git,github,command-line,software-distribution
All Releases are tied to Git tags. You can either choose an existing tag, or let GitHub create a new tag from an existing branch when the Release is created. You can create releases and attach one or more artifacts (e.g., your binaries) via the GitHub API; see the docs...
How to create a paypal form display in github README
In all likelihood, it is not possible for security reasons (see CSFR and XSS for examples of potentially related security concerns). In other words, GitHub has intentionally not allowed forms within Markdown text and will strip them out if they are included. For more general information about how to include...
How to push local git repo to remote branch?
You need to make sure that local repo branch name matches the remote branch name. When you create a new local repo the name of the branch is called master, and that probably already exists in the remote you are trying to push to. To rename your local branch see:...
Git rebase original project
All you need is to sync your fork, the instructions are explained here. After following all those steps you would end up with your Master branch sync'ed with your upstream (the original project you forked from). Now, if your development branch is based on master (I suppose so) then you...
How do I create my own Git branch to work on?
You can do steps 2 (git branch) and 3 (git checkout) at the same time with git checkout -b branchname For step 4, I am accustomed to git push -u origin branchname to explicitly create the branch remotely and set it as the upstream for your working branch. This lets...
Fix git branch after another developer did a reset
If I understand this correctly, the other developer's local branch looks like this (reverse chronological order): +- (F) His last commit (Required) +- (E) His commits 2, 3, 4, etc ... (Required) +- (D) His commit 1 (Required) +- (C) Your commit 2 (To be discarded) +- (B) Your commit...
write puppet config to clone github repo
windows,git,github,puppet,git-clone
It is indeed possible on Windows! You can use the puppetlabs-vcsrepo module Screenshot using a Windows 2012R2 machine in Virtualbox, command-line on the left, GUI on the right. Code I used in the example: vcsrepo { 'C:\foo': ensure => present, provider => git, source => 'https://github.com/puppetlabs/puppetlabs-vcsrepo', } To keep the...
Move git configuration from Windows to Ubuntu
To build upon Hi-Angel's answer: Under Windows 7 The local Git config is inside the .git directory at the root of your repository/project. The global Git settings are in C:\Users\<user_name>\.gitconfig. The SSH keys you generated are in C:\Users\<user_name>\.ssh (at least, this is the standard). Under Ubuntu/Linux The local Git config...
How to include a commit in a tag after the tag was already created
just move the tag to the new commit. steps: delete the tag checkout at new commit apply the tag don't forget to push to update the remote...
How can I hide sensitive data before commiting to GitHub (or any other Git repo)? [closed]
If you’re using Python, you might consider using the keyring module. This allows you to store secret information in the system keychain, and then there’s no risk that it could be accidentally checked into Git. Here’s a simple example for storing and retrieving an API key, based on the docs:...
Usage of environment variable of Travis CI in maven test
You can encrypt your env variable with your puplic/private key in travis CI see http://docs.travis-ci.com/user/encryption-keys/.
Restore local master after making commits on it
git,github,branch,restore,master
You can do this in 3 steps: Create a new branch out of your existing master branch git checkout -b feature_branch Delete your master branch git branch -D master Create a fresh master branch git checkout -b master --track origin/master This creates a feature branch (which you should have done...
How to use Library from GitHub in android App
android,github,gradle,libraries
You have add path to your aFileDialog library in your settings.gradle Make sure that folder you point to includes build.gradle file include ':app' include ':aFileDialog' project(':aFileDialog').projectDir = new File(settingsDir, 'aFileDialog') or (judging from the library folder structure on GitHub) project(':aFileDialog').projectDir = new File(settingsDir, 'aFileDialog/library') ...
How to reset git server association
Git servers for your project are saved as "remotes". The default remote is usually called origin. You can have more than one, but all your remotes must have unique names. The error you get is telling you that you already have a remote called origin configured. To know what remotes...
Push changes to branch github
You need to run git commit, for example git commit -m "COMMIT MESSAGE HERE" to commit changes to your local repo. Once you're done with the local changes, you can push to origin using git push
Advantages/disadvantages to branches and forks
git,github,git-branch,git-fork
There is not actually much difference; a branch in a different repository (the fork) is pretty much the same as a separate branch in the upstream repository. It’s just that they are a bit more separated. A few advantages for using a fork may be to have it more separated,...
Why doesn't “go get gopkg.in/…” work while “go get github.com/…” OK?
windows,git,powershell,github,go
The root cause has been found: Because my computer use a web proxy, so I need to set proxy in environment variable: C:\Users\xiaona>set https_proxy=https://web-proxy.corp.hp.com:8080/ C:\Users\xiaona>set http_proxy=https://web-proxy.corp.hp.com:8080/ C:\Users\xiaona>go get -v gopkg.in/fatih/pool.v2 Fetching https://gopkg.in/fatih/pool.v2?go-get=1 Parsing meta tags from https://gopkg.in/fatih/pool.v2?go-get=1 (status code 200) get "gopkg.in/fatih/pool.v2": found meta tag main.metaImport{Prefix:"gopkg.in/fa tih/pool.v2", VCS:"git",...
Ownership on github and how to unfork a repository?
git,github,github-for-windows,github-for-mac
Find the forked repository under "Your repositories" and look in the upper left, you should see "forked from USERNAME/REPO_NAME" that's the repo you forked from, whoever owns that repo would be the owner. If you want to find more you can click the forked from link and then the...
My .gitignore file is not working
Replace * .css by *.css (and same for the other ones) Relevant documentation...
How do I put my index.html in the same folder as my other .html files on github?
You can achieve this with a simple JS call <script type='text/javascript'> window.location.href = 'path/to/your/page.html'; </script> This can be the only content inside your new index.html but it is required to have an index page for the web client to recognize....
How to deal with forked gems and bundle
ruby-on-rails,git,github,gem,bundler
Gemfile.lock should know what gem to load, when you do bundle update or installing a new gem, Gemfile.lock will be updated too with new gems, paths, etc.. and also the revision hash. The hash at the end of the Fetch/Push URL that you see when you run git remote show...
.gitignore File Not Working With Bonobo
git,visual-studio,github,bonobo
If they are showing up as changed (and not added), they were already in the repository before you added the .gitignore file. So you need to remove them from the repo by either a) deleting them from your local box and committing, or b) using git rm --cached on them....
A new git project from a branch?
I want now to separate that branch into a separate project, which could be synchronized with the original project, so when I make some changes in the original project, i could also pull them to the new branch (but not the other way round). Create a new project in...
From development to deployment with Git
The best approach i think (and this is what we are following on a large project we are working) is to setup a separate git project on a separate environment (let's say "Test" or "Stage" environment) from which you are going to clone the git project hosted on gitlab. After...
Python - Resolving PEP8 errors
Yes; Wait(self.marionette).until( lambda _: ( self.autocomplete_results.is_open and len(self.autocomplete_results.visible_results) > 1 ) ) Check: $ pep8 --max-line-length=99 --exclude=client foo.py parens to the rescue! :) ...
Git tag name as version in Go via Travis-CI
So I fixed this my self. My problem in the above example was in the Travis file. I seems I needed quotes around my "script" parameter. For completeness here is my new Travis file; language: go script: - "make VERSION=$TRAVIS_TAG" go: - 1.4.1 deploy: provider: releases api_key: secure: reallylongsecurestring file:...
TeamCity checkout GitHub repo to specific absolute path
github,path,teamcity,git-checkout
Teamcity can work with both absolute and relative path. If you know exactly what is your absolute path you can specify it as the custom checkout directory under Version Control Settings tab. ...
GitHub release asset download with node.js
node.js,github,github-api,nw.js
HTTP 302 isn't an error: The HTTP response status code 302 Found is a common way of performing URL redirection. You can handle HTTP 302 Found by retrieving the URL shown in the Location response header. Instead of using http.get, you might want to consider using the request library as...
How to make git recognize that I deleted a file? [duplicate]
Assuming that your last commit is the one with bigFile.txt, do the following: git rm bigFile.txt git commit --amend This will alter your last commit to not have bigFile.txt in it. ...
can I display asciidoc document in github?
Your file isn't syntactically valid (or rather the line is treated as plain text). Your original file: ==This is a test this is a test of using asciidoc There's no space after the ==; I believe it's required. A modified version that displays correctly: == This is a test this...
Starring a repository with the github API
The problem here is the parameters you pass to urljoin(). The first parameter is supposed to be an absolute URL, while the second parameter is a relative URL. urljoin() then creates an absolute URL from that. Also, "user" in this case is supposed to be a literal part of the...
Merge Pull Request Manually
There are many ways First Is checkout userstory1 git checkout userstory1 Now merge mainbranch git merge --no-ff mainbranch It will show you the conflict. To see clearly type git status and pay attention for the files that are changed on both side. Now resolve the conflict manually and then type...
How to ignore the contents of a previously tracked directory in git?
This should be enough: git rm -r --cached auto-save-list/ echo "/auto-save-list/" > .gitignore git add .gitignore git commit -m "Records untracking of /auto-save-list/ folder" No need for '*' If you still need the directory to be there (versioned in the Git repo, even though Git doesn't track an empty folder),...
rebasing interactively, but only one commit shows up?
What happens if you do? git rebase -i master ...
How does initializing a repository with a README help in letting you immediately clone the repository to your computer?
git can perfectly clone an empty repository. But in that case, you end-up with a repo with no branch, which can be unsettling for Git beginners. That also means that, when you create your own commit in that empty cloned repo, you need to setup the upstream branch on the...
how to clone GitHub repo locally via libgit2sharp?
git,github,git-clone,libgit2sharp,repo
401 is the HTTP code meaning that you need to authenticate against the server. There are code paths in libgit2 which do not always correctly convert this situation into GIT_AUTH, but that's what it means. GitHub (and other services) can also return this error when the repository does not exist,...
Git check compare is slow
Git is fast enough. If you want them in your repository - you will have to add, commit and push them once. If they don't change, they will never again be transferred and will NOT influence the pull and, moreover, merge time. It is because git stores snapshots of files...
error: pathspec 'test-branch' did not match any file(s) known to git
git,github,git-checkout,git-fork
When I run git branch, it only shows *master, not the remaining two branches. git branch doesn't list test_branch, because no such local branch exist in your local repo, yet. When cloning a repo, only one local branch (master, here) is created and checked out in the resulting clone,...
How much should I rebase interactively? [closed]
git,github,translation,git-fork,rebasing
As much as you want (assuming your repo is not shared with anyone else). Bear in mind that you are rewriting the history every time you squash commits.
Github: Permission denied (publickey) but I got “You've successfully authenticated” message
The answer is related user permission issue. I need to set the correct folder permission for current user. For the git sudo issue, the answer can be found in below link: https://help.github.com/articles/error-permission-denied-publickey/#should-the-sudo-command-be-used-with-git Thanks Chris for looking into this question....
git add file to archive
git,github,gitignore,gitattributes
As far as my knowledge goes, git archive only archives files tracked by git, and .gitignore only ignores untracked files. Hence you will never manage to git archive files that are in your .gitignore. Or what am I missing?
git fork from certain tag version - requirements.txt
Forking the repository clones the entire repository, not just the master branch. You can then checkout the tag you want to work on, make the required changes, and create a new tag. # checkout the tag git checkout tag_to_fork_from # alternatively, create a new branch starting with the tag git...
Where is git command after installing “GitHub for Windows”? [closed]
windows,git,powershell,github,github-for-windows
After checking, it should under: %LocalAppData%\GitHub For example, in my PC, it is: C:\Users\xiaona\AppData\Local\GitHub\PortableGit_c2ba306e536fdf878271f7fe636a147ff37326ad\bin ...
Updating a Project on GitHub Without Having Git Installed
Do I click on the "Edit this file" button and enter the changes manually? Will all changes be tracked so that I can go back to previous versions? ==> yes, changes will be tracked into the git history of your github account. Your company policy doesn't allow git so...
how to update my github library with an existing fork?
Your friend must create a pull request. You have to merge these pull requests with your master once you have reviewed them. If the merge is successful, it'll show the new master....
How to load the project into Github
These folders should be installed/populated via a dependency manager at install time (npm and bower, respectively). You should create a .gitignore file in the root of your project as per this. This should be added to git so it is cloned with the repository on other machines too. # cat...
Associate git repo with existing fork network
GitHub support has removed fork relationships for me before, so I suspect they'd also be able to reattach you. To do it on your own, I'd: Make a new fork of the upstream repo Change your personal fork's origin to the new fork You'll lose GitHub history for your current...
Tools for Apache Cordova - Installed Plugins are skipped in build
cordova,github,git-branch,visual-studio-2015,visual-studio-cordova
As it turns out, you should not check in the "android.json", "remote_ios.json","windows.json", and "wp8.json" from the plugins "folder" or this problem can happen (though fetch.json is fine). Unfortunately they are missing from the default exclusion list for Cordova projects in VS 2015 RC. To fix, add these four files to...
Get list of changed files from remote server git
Use GitHub's email service: Emails sent by the email service are different from regular notifications; they don't show up on the web, and they provide different contextual information. Email services send the following information: The name of the repository where the commit was made. The branch a commit was made...
Mount Github link as docker volume
You cannot mount such remote resources that are on the Internet. What you can do is to have a shell script in your docker image which when executed will download those resources. And make docker run that script when the container is run. Dockerfile FROM ubuntu:latest COPY download-from-github.sh / #...
How to quickly format programming codes in the GitHub's Issue?
Simply wrap the code with the fenced code block delimiters. ``` here is the code block ``` You can also specify a language. ```ruby puts "hello" ``` ...
choose authentication for git pull
There are two ways of setting up SSH keys on GitHub. User level at https://github.com/settings/ssh or repo level: View the repository on GitHub, click Settings to the right, then Deploy keys, and add your public key....
Existing Java Project into Github
Ye, I think it's fine. Another one is to create repo using git init and then git remote add origin https://github.com/user/repo.git ...
Managing git repos
Yes, that's the common way to do it. They only get notified if they are on github or other collaboration platforms.You could easily just clone the repo, do your stuff and nobody will have knowledge of that. This depends on your changes. Merging back typically is done in a...
Edit comments next to each file/directory
This comments are the commits comments. You can edit the comments that has not been pushed online (not your case) with : git commit --amend If you have pushed your commits you will have to force push a commit with an amended message: git push --force example-branch Docs: Here's a...
How to copy only one file from a GitHub repository to local machine?
The way git repos work is you have the working tree and in it a .git directory that contains a database with your project's history. When you delete from the working tree, you can do git checkout -- FILE and git will go to that database and retrieve the latest...
Pull request within one project/branch?
Yes. You can create pull request for separate branches of the same repository. C just needs to make sure to push their changes on a separate branch then, so that they can create a pull request from it to the master branch of the project. But yeah, this is totally...
How is a branch different from a folder, in a GitHub repository?
read the article to understand how github works. A branch is like a work in progress, you make a copy of your main code (or part of it) make changes (add new feature or fix a bug) and when you have tested it that it works perfectly fine you merge...
Using GitHub API to determine if the last commit to master was a result of a merged pull request?
The PR should be one of the parents (the second one) of the commit in master, since that commit is the result of a merge of the PR. You can fond that parent with the GitHub commit API GET /repos/:owner/:repo/git/commits/:sha GitHub doesn't offer a way to get the branch from...
Cannot run elastic search in circleci to make my rspec for elasticsearch to pass?
ruby-on-rails-3,github,rspec,elasticsearch,circleci
The error message says circle.yml should be in the repo's root directory, but you have it the config directory.
How to point branch to master after rebase complete
Just do: git checkout hotfix git merge master ...
What does a red text-background mean in GitHub comparison view?
The red background-color is definitely being caused by the error-highlighting feature of GitHub's text editor/viewer. You can find the same behaviour occurring to an intended block comment in another JSON file on GitHub: As for your comment about some illegal characters not being highlighted: I also found that certain JSON...
git commit process somehow broken
You need to pull before you can push. git pull Then, you should be able to push. Be vigilant for merge conflicts before you do so, as any code with those conflict markers will not compile. With the new information you've given us, be sure that your master branch is...
Nested bullets in markdown for Github
You just need to indent your code blocks with 4 spaces.
Git submodule fail because of link to unexisting revision
That means A has recorded a gitlink (special entry in the index) referencing a SHA1 of the submodule B which was never pushed to GitHub. When A used B in a local clone, B was at 32a0a80. A was pushed, but B was not. Hence the issue. Normally, a git...
Git - coworker somehow overwrote my entire commit while resolving a conflict
git,github,git-merge,merge-conflict-resolution,git-cherry-pick
Nothing just disappears in Git. You can do one of the following: Undo the merge on development branch. Undo a Git merge? Cherry-pick your last commit (with all your contributions) from the history. How-to git backport (rebase/cherry-pick) an already merged branch ...
How to Add a Zip I downloaded from GitHub to Version Control?
Your best bet is likely something like this: Clone the repository to another directory, e.g. BlahDevelopment-clone Copy your modified files into the cloned directory, overwriting what's there Run git status to see what's been changed and then commit those changes Note that you will run into trouble if any of...
Keep config file secure using github and Elastic Beanstalk?
amazon-web-services,github,passwords,config,elastic-beanstalk
Your intuition is correct! Definitely keep your keys/passwords/credentials out of your committed codebase. Elastic Beanstalk provides environment variables in the control panel for just this purpose. The official documentation can be found here: http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html#command-options-ruby These environment variables can be edited through the Elastic Beanstalk UI. You can then reference these...
error CS1729: The type `ARSoft.Tools.Net.Dns.DnsServer' does not contain a constructor that takes `4' arguments
c#,github,visual-studio-2013,dns,syntax-error
The code here looks like the DnsServer takes those 4 arguments. Are you sure you have the correct binaries? How did you install? If you are using the codeplex version then it doesn't look like it take a ProcessQuery parameter....
Best practice for structuring git branches
Question 1: The process should be: create a feature branch on origin make a PR into simplare with that feature branch once simplare merges your feature, pull down onto your origin master Reason to not merge your feature branch into origin before making a PR into simplare is that your...
How to pull files and only override conflicts
Doing a git pull should do the right thing, as long as you haven't done git add on the files you don't want in to have under git. I suggest putting the names of those files in a .gitignore. If you are running into a specific problem with using git...
How To Add Files Inside Folder, Not The Folder Itself
This is not how Git works. Only one branch is visible in your working copy at any time. Trying to make it work otherwise is just hurting yourself. A possible workaround is to have multiple clones of the same repository, each looking at a different branch: github -> project ->...
Git will not push up everything in assets (Unity 5)
This section makes Git literally ignore everything that was not tracked yet. # Ignore everything /* /*/ So Git now only tracks files that were added before the second commit, which introduced a .gitignore file. Use the .gitignore from the SO answer, mentioned above. It's a good one....
Github: forking loop
You can add curlygirly's repo as a remote to your original repo and merge in changes from it just like any other branch. For example, if you want to merge everything on curlygirly's master branch into your original repo's master: git remote add curlygirly https://github.com/curlygirly/yelp_clone-1.git git fetch curlygirly git checkout...
GitHub API returned Url meaning
Those are placeholders value, that you would need to replace by an actual value in order to use those links. It serves to remind a user how to access, for instance, the following_url for another user. without {/other_user}, that url https://api.github.com/users/zhuhuihuihui/following would list all users followed. with {/other_user}, that url...
What should I do if I put MS Office (e.g. .docx) or OpenOffice( e.g. .odt) document into a git repository?
Solution Make a .gitattribures file in your working directory and add the following line to it: *.docx binary Why not just set core.autocrlf=false ? This is useful too. But configuring .docx as a binary format solves not only this problem, but also potential merge issues. What is the origin of...
Not able to clone private repo using dockerfile
Look at my example, i have a private ssh key in the directory where i dockerize app(ssh_keys/id_rsa), and public key i have already upload to the private repo: FROM ubuntu:14.04 MAINTAINER Alok Agarwal "alok.alok.com" RUN apt-get update #Install git RUN apt-get install -y git RUN /bin/bash -l -c "mkdir /root/.ssh"...
Latex \newcommand in kramdown
There seems to be two questions here — first, can one define commands in kramdown similar to LaTeX's \newcommand syntax, and second, can kramdown support mathematics. Regarding the first issue, kramdown itself doesn't support that syntax or anything like it that I'm aware of, and probably isn't going to in...
How to pack commits in git
You can cherry-pick the commits you need from branchA to branchB: First get the commit IDs you want to "pack", you can get this by simply doing: (on branchA) git log Then switch back to branchB and cherry-pick the commits, preferentially in chronological order: (on branchB) git cherry-pick <commitID> In...
PHP Frameworks and Project Repositories
php,git,github,zend-framework2,repository
Use Composer: Composer is a tool for dependency management in PHP. It allows you to declare the dependent libraries your project needs and it will install them in your project for you. Install Composer Run composer require 'zendframework/zendframework:2.5.1' This will create or update your composer.json and composer.lock files These files...
I need git to include the parent directory
Let's say your parent directory is named parent, and your child directories are named package1, package2, and package3. Let's also assume that package1 is the directory where you have your git repository. I would just make another package1 directory as a child of the original package1 directory, and move the...
How to change a connection to Github from SSH to HTTPS?
git,github,ssh,https,git-remote
Assuming your remote is called origin, run git remote set-url origin https://... git remote set-url --push origin https://... You can view the configured remotes with git remote -v, which should now show your updated URLs. See the documentation for git-remote for more details....
git fatal error when pushing md file to Github
It looks like your remote isn't configured properly. You can view your configured remotes with git remote -v GitHub remotes generally look like [email protected]:user/repo.git for SSH connections (note the [email protected] and :), or https://github.com/user/repo.git (note the https://) for HTTP connections Your remote appears to be an HTTP remote without the...
Trying to make an alias for an .exe - Powershell saying it cannot resolve the alias
powershell,github,powershell-v1.0
Are you sure C:\Program Files (x86)\Notepad++\notepad.exe exists. Try a Test-Path "C:\Program Files (x86)\Notepad++\notepad.exe" and see the outcome. Also, instead of New-Item, just use New-Alias