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...
Remove tracked file from Git when file has $$ in name
This is a shell specific problem rather than a git problem. Assuming that your shell is Bash, use single quotes instead, since no variable substitution takes place inside them: git rm --cached '~$$ClassDiagram.~vsdx' ...
Is `pull` needed after checking out a new branch?
If the branch is already on origin and you do not have a local copy and you check it out, then it will contain all commits anyway so you do not need the pull after. If you already have a local copy of the branch it will checkout that one,...
How to point branch to master after rebase complete
Just do: git checkout hotfix git merge master ...
Git sees duplicated modified file
Look again carefully AreaChart.js and Areachart.js are different files. One has capital C and other has lower case c character. Since Git is case sensitive, and your filesystem is case insensitive, you will only see one of these on your filesystem. If you only want one in Git, you should...
How do I remove Tag in GitLab repository
Obviously you don't have the permission of deleting tags in remote GitLab repo. Either ask for the owner of the repo to grant you the permission of master or let him help you to delete the tag would help....
How to undo a successful “git cherry-pick”?
A cherry-pick is basically a commit, so if you want to undo it, you just undo the commit. when I have other local changes Stash your current changes so you can reapply them after resetting the commit. $ git stash $ git reset --hard HEAD^ $ git stash pop #...
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...
Checkout branch on different remote
Just fetch the refs from the remote (this will fetch all branch, commit, refs etc for the upstream repo) git fetch upstream After this, checkout the needed branch (this creates a local copy of the branch) git checkout -b <branchname> --track upstream/<branchname> Now if you want to pull the changes...
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 do I view the list of commits that haven't been pushed yet?
If you do a git log origin/master..HEAD, it should show you all the commits that have not been pushed (assuming you are on master, of course).
How to download files from git repository?
Installing git in a new dir should be the best option: If your repo is already initiated, check your remotes: git remote --v $ git remote --v heroku ssh://xxxxxxxx.xxx:repo.git (fetch) heroku ssh://xxxxxxxx.xxx:repo.git (push) Check the list you have there. The first parameter, is the remote name, then you should write...
Is there a way to push to a remote Git repository without having to fetch its objects?
To the best of my knowledge there is no way to do what you want. When you try to push some commit to a remote repository Git will detect whether your current branch is behind its remote counterpart and it that case it will prompt an error: ! [rejected] master...
Git Clone QT5 Gitorious
Seems like there is a Qt 5 project on Github: https://github.com/qtproject/qt5 git clone https://github.com/qtproject/qt5.git --branch v5.3.1 --single-branch 5_3_1_x64_msvc2012 If you're unsure about the integrity of the code, you can compare the tree SHA-1 of your new clone with a reference one that you have already cloned some time ago (since...
Stash Git error “fatal: remote error: CAPTCHA required”
The problem was a malformed URL: it should be https://[email protected]/scm/~username/project.git instead of [email protected]
Git: Remove directory with quotes and backslashes from repo
git,directory,repository,special-characters
I wasn't able to try this out, because my problem somehow solved itself. I checked out the files and directories from the repo one by one on another Windows system, except the "broken" directory. Then, when I commited the next time from my new working copy, the directory was in...
Stop git from bringing changes to master into my branch?
So the problem here is that MYBRANCH is set up to track origin/master, which means that when you do a git pull, origin/master will be merged into it. You can untrack it by doing git config --unset branch.MYBRANCH.merge. Assuming there is an origin/MYBRANCH, you can track it by doing git...
Is there any way to checkout the previous commit without knowing the ID? [duplicate]
Yep, git provides two nice ways to do this: HEAD^ or HEAD~1 (HEAD is your current commit). The number of carets following HEAD or the number after the tilda determine how many commits back you are referring to. So for instance HEAD^^^ or HEAD~3 both refer to three commits back....
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 ...
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...
How can I get the last commit in all tags?
Simply checkout the name of the branch for which you need the last commit. So if you are working on master, do git checkout master. (Edit: after getting more illumination of the problem from the comments, it is not as easy as above). OK, so my guess is that you...
RTC to Git Migration using rtc2git - https://github.com/WtfJoke/rtc2git
Python 3.3.5 installation fixed this issue for me. Downloaded from - https://www.python.org/downloads/release/python-335/
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?
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",...
git: assume unchanged bit not set
While the actual behavior may have changed between versions, this is an implementation detail. Fundamentally, assume-unchanged is a mechanism to allow Git to avoid hitting the filesystem to look for changes. It means that Git may avoid looking at the files, it doesn't mean that Git must avoid looking at...
gitignore in PHPStorm
Most likely, certain files inside those directories were already added to version control before the directories were added to .gitignore; note that the files listed as ignored in the command line and the ones being modified in the UI are not the same. You can remove them from source control...
How to import bugfix of master in all other branches without including the commits before?
git,version-control,merge,git-branch
Merge instead of cherry-pick! cherry-pick makes a new commit on your branch, and that commit doesn't not refer to where the bugfix was originally created, hiding actual history. Furthermore, the bugfix could be several commits, or have further development in the future (like, it didn't turn out to really fix...
Extended description text on Git
There is no "extended description" concept in git. Only the commit message. What happens is that the commit message can have a single line or multiple lines. External tools or websites such as git-cola or GitHub can interpret multiple lines commit messages as: The first line is a short description...
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...
Undoing a git commit on a folder that contains many other folders
All the git data is stored in a .git folder in your code directory. If you remove this folder, the newly created git repository is gone and you can create a new git repository in the subfolder project2.
Need help pushing a new branch to remote
When you created the database branch, the staging area already contained all of the files that were in the branch you branched from. So all you should need to do is push origin database, and the branch will be up there.
Write Access for user on all repos on Gitolite
myreponame.git doesn't exist on the server currently, but I'd like to be able to add it automatically just by using the remote add origin command. That is not how you add a new repo with gitolite. You need to modify your conf/gitolite.conf file of your gitolite-admin repo, in order...
Jenkins does not find my git repository in Visual Studio Online
git,jenkins,visual-studio-online
Well, I finally made Jenkins perform the clone of a Visual Studio Online git repository. The official Microsoft documentation is wrong. Jenkins and the Git plugin do not work as they explain there. In order to the clone operation to work, I had to put on the repository URL field...
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...
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...
Custom post-receive hook with gitlab
on the file so it is owned by the 'git' user. I have no git user on the webserver... all other git related files are owned by my user or root. That is because oyur webserver is a client of the GitLab server. The documentation you reference is for...
Getting code from my forked repository
git,laravel,repository,laravel-5,composer-php
Having a look at your repository in https://github.com/Yunishawash/api-guard it looks like it doesn't have a branch called dev-fullauth. Instead there is a branch dev-bugfix. But you must not name your branch including the dev- prefix. Rename your branch at github from dev-bugfix to bugfix and then your require section would...
Git undo changes made in a specific folder
If you want to undo the changes, do git checkout app/code/core/.
Git content appear only on log
This is most likely because someone else on your team botched a merge. Here is a scenario that would replicate what you are seeing: You do commit 1 and push Person X does a pull and modifies other files You do commit 2 and push Someone modifies some of the...
Not able to create staging instance on heroku [duplicate]
ruby-on-rails,git,heroku,sqlite3
In your Gemfile group :production do gem 'pg', '0.17.1' gem 'rails_12factor', '0.0.2’ end and also remove gem 'sqlite3' OR group :development, :test do gem 'sqlite3' end Because heroku can't install the sqlite3 gem. But you can tell bundler that it shouldn't be trying to except when developing. Then run bundle...
How to tell git-svn that files are NOT binary
git,svn,migration,git-svn,gitattributes
The binary attribute "macro" is a shorthand for -diff -merge -text (see gitattributes docs). In opposite to the the text-attribute which influences the line ending conversion of files between the repository and the working copy version, the diff and merge-attributes do not influence how Git stores files. The latter two...
Git Clone: Why aren't remote branches created/available locally immediately?
This answer to a similar question gives the "why" you are after. +1 @Arkanosis for the initial link (not a duplicate question but the answer to this question does lie in that one)
What is the difference between stop tracking and discard file in git SourceTree
In SourceTree, selecting "discard" on a file just throws away your local changes; stop tracking removes it from the repository. However, as long as you have deleted the file on your local drive, and you can see that deletion in the "Staged Files" section of SourceTree, it will be deleted...
Github client for mac: how to overcome the Great Wall?
It seems that GFW only block contents distributed with CDN of github, like assets-cdn.github.com. Repo operations with git will almost not be affected by GFW. And if you are connected to a VPN, you already penetrate GFW. You issue is probably not caused by network. You can try to git...
Using git with Doxygen FILE_VERSION_FILTER
I was looking more for a git command that accepts a file name and outputs how many times that file has been included in a commit. For a file, you can use one of the git log commands in "List all commits for a specific file": git log --follow...
Configure Git to use a .pem key from a specific location
From the git(1) man page: GIT_SSH If this environment variable is set then git fetch and git push will use this command instead of ssh when they need to connect to a remote system. The $GIT_SSH command will be given exactly two or four arguments: the [email protected] (or just host)...
Cannot get my post-commit script to run (git)
For the remote repository you should use the post-recieve hook. I think the post-commit hook is only run on the clients, and not on the remote repository. From the docs post-receive This hook is invoked by git-receive-pack on the remote repository, which happens when a git push is done on...
Rename a merged commit without losing that commit's parents
Use git rebase with --preserve-merges
Triggering Jenkins to run application tests when GitHub PR is created
git,jenkins,continuous-integration,ansible,continuous-deployment
This is achievable with Jenkins. There are 3 main steps to this task: Use the Jenkins GitHub plugin to trigger a build. Use the Jenkins Ansible plugin to execute your ansible playbook during build process. Update GitHub repo with the result. This part is a little more complex since I...
How to clone a public GitHub repository recursively without authentication?
Your submodule is configured to clone using git: - update .gitmodules to reference the https: URL instead. Change: [email protected]:organisation/submodule.git to https://github.com/organisation/submodule.git...
ERROR while adding meta-oic layer to an Intel Edison image
You have a typo somewhere: 'nfs-utilsiotivity-resource-samples' should be 'nfs-utils iotivity-resource-samples'. Most likely reason for a bug like this is using IMAGE_INSTALL_append and missing the space in the beginning, e.g.: IMAGE_INSTALL_append = " iotivity-resource-samples" Check you local.conf for a missing space....
Git: Differences since a commit
For the first one, try git show 0639706 Alternatively, you could do git diff 0639706~1 0639706 For the the second one, git diff 0639706~1 should do the trick. If you are only interested in seeing the file names, rather than the entire diff, you can use the --name-only option with...
Go back before commit and push changes
The push aside, reset is made for this. $ git reset HEAD^ will move your current local head (master, maybe?) one step up in history, while keeping your local files untouched. Then for the push (and you should listen to @jeremytwfortune in his comment), you can (but shouldn't) remove it...
eb cli 3.0 is not putting my settings from my existing environment after connecting it
php,git,amazon-web-services,amazon,elastic-beanstalk
eb init grabs the basic settings from your currently running environment. This includes: Platform Keypair name Everything else is environment specific. If you would like to save your environments configuration to a file, you can use eb config save Typically, you can edit the configurations in place by using eb...
Create a bat file that will run git and then run script
If you start an interactive shell (the -i option) it will not return until you exit the shell. To have commands run as part of your shell startup you then add them to the /etc/profile script. As you are dealing with the Git for Windows shell here that will be...
.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....
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...
Switching branches in Git with external dependencies
git,maven,dependencies,git-branch
It actually depends on an IDE you're using. I haven't noticed any issue with this when using IntelliJ IDEA. It handles any pom.xml changes on the filesystem level very smoothly. However, some time ago, when I was using Eclipse, I believe I saw such a problem you're talking about. Then...
Git post-receive hook is not executed
linux,git,githooks,git-post-receive
The hook file is incorrectly named post-reveive.
Gitolite denies access to a repo while allowing another
While Windows is not case sensitive, Gitolite is, testing for the existence of the bare repo folder (see lib/Gitolite/Conf/Load.pm#L245-L250). or you mis-spelled the reponame If the gitolite.conf file allows access for OpenTK-10Bit-test, trying to clone OpenTk-10Bit-test (as commented by And) will not work and will be denied....
Hide sensitive information from git changes
What you probably are looking for is a filter. You set these up in your .gitattributes file to run one substitution upon adding a file to the staging area, and another substitution upon checkout: The image is from the .gitattributes section of the Git book, which has details on how...
Capistrano and Corkscrew PATH error
ruby-on-rails,git,ssh,capistrano,gitlab
The problem seems to be that ssh can't find the corkscrew executable. I double-checked my local ~/.ssh/config file, and I use the full path to the corkscrew executable in there: Host * ProxyCommand /usr/local/bin/corkscrew <server> 8088 %h %p ~/.ssh/proxyauth (Since I'm on OS X and have installed corkscrew through Homebrew,...
Override .gitattributes text=auto in Windows
windows,git,gitattributes,core.autocrlf
.gitattributes overrides all config settings, so it really can't be overridden; it is the "overrider," so to speak. While you can simply remove the line, this will cause inconsistent behavior on other developers' machines if they have core.autocrlf=true. So the best bet would be to add the following line to...
Why can I view some Unix executable files in Mac OS X and not others?
Executable files may be scripts (in which case you can read the text), or binaries (which are ELF formatted machine code). Your shell script is a script; git is an ELF binary. You can use the file command to see more detail. For example, on my nearest Linux system: $...
Migrating Codeplex SVN to Git with git svn clone
git,svn,git-svn,codeplex,migrating
Try git svn clone https://mohid.svn.codeplex.com/svn mohid_code without argument -s, because mohid doesn't use standard layout. Also wait some time. First ~10 minutes looks like nothing hapens, because git try fetch revisions from 1 and first revision in mohid repo is 28559...
Need help doing a git merge
Your changes would be lost if they pulled in new changes. Git is actively trying to prevent that, so it forces you to either blow away the changes or stash them for later. Stash the changes: git stash save Then your collaborator can pull the changes into their branch. If...
“Arguments to path.resolve must be strings” when calling 'gitbook build' from a Git hook
node.js,git,gruntjs,githooks,gitbook
Some further consideration brought me to the right direction: Invoking a Git hook has a different login context than working on the server's command line. So running set > some-file in both contexts revealed significant differences in environment variables. Some experiments turned out that it was export HOME=/home/git that had...
“Cannot resolve symbol baoyz” Android Studio using baoyongzhang's SwipeMenuListView
Create a package boayz - Copy + paste these files into this package. Ensure each file builds and you have the correct imports etc. Then ensure the project builds and hopefully it will run. It would have been easier for you to take the repo and see if you can...
Xcode source control - git add
xcode,git,crashlytics,fabric-twitter
That's weird. Usually Xcode automatically adds all changed/new files to the commit automatically, and you can check any files you want in the left side of the window. Regardless, you should be able to cd into the root directory of the Xcode project using Terminal and run git commands, like...
Can git ever send your code to a repo that isn't yours?
git,github,git-commit,git-add,git-init
Doing a git commit locally won't result in your code being sent to any repo, let alone a repo which is not yours. When you do a git commit, Git will add some local objects corresponding to the changes you have made in the current working branch. In order for...
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,...
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.
Why does git checkout modify the index without being documented as such?
From the man page you pasted in your question: The <tree-ish> argument can be used to specify a specific tree-ish (i.e. commit, tag or tree) to update the index for the given paths before updating the working tree. So you can see, it does clearly state that the index will...
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...
Git-Flow and dependencies
When working on a feature branch, it is a good idea to merge the develop branch into your feature branch regularly, so that you a) know that all will work when you merge back into develop and b) can avoid huge merge conflicts. So that is what I would suggest...
Composer package not found in private repository
Your required version is almost certainly incorrect as you have a minimum-stability of dev (which is rarely a good idea). ... "require": { "pico/pico-core": "dev-dev" //ensure the dev branch actually exists }, ... Here's a useful guide to composer stability flags: https://igor.io/2013/02/07/composer-stability-flags.html...
I rewrote my program and need some suggestions for my git repo
you might want to merge these two repository. here is a answer about how to do this: How do you merge two git repositories? although I will still ask if I have rewritten everything and is better version why I need to worry about the old version. ...
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...
git - list of all changed but not deleted files in a commit
Try using this command: git show --diff-filter=AM --pretty="format:" --name-only #{commitId} It is what you mentioned in your original problem with a --diff-filter flag added to restrict to only files which were added (A) or modified (M). For a complete list of the types of files to which you can restrict,...
How to get rid of .ignore file in Git?
.gitignore is just like any other file under version control, so yes, you can delete it. However, keep in mind that it probably has entries in it that should be kept, so instead of deleting it, I would just modify it so that your jar files are no longer ignored.
Working with 2 git repos simultaneously
Assuming upstream is the name of the upstream remote and that you want to merge in its master branch, I think it should be as simple as: #fetch upstream changes git fetch upstream #go to the branch where you'll integrate them git checkout your_development_branch #merge in upstream changes git merge...
How to list remote branch without web request?
git branch -r will list all remote-tracking branches that exist in your local repository: $ git branch -r origin/HEAD -> origin/master origin/master You can also use the -a option to get all branches that exist in your local repository: $ git branch -a * master remotes/origin/HEAD -> origin/master remotes/origin/master ...
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...
PhpStorm Git folder modified color
Settings (Preferences on Mac) | Version Control | Show directories with changed descendants
How do I move an unstaged file to untracked?
I want to remove files from the 'not staged' section, but still see it when I type git status. Where do you want them moved to? There really are no other places to hide. As you mentioned, these are tracked files, so you don't want to remove them from...
Why does rebasing unset my current branch and does not complete?
I fixed conflicts and committed the changes: That's where you went wrong. git rebase --continue expects the changes to be in the index, but not yet committed. Since you already committed the changes, git rebase's own attempt fails, because there are no changes left to be committed. You should...
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...
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....
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...
Add a file named “--” to a git repository
You can use: git add ./-- or: git add $PWD/-- or even: git add -- -- These are all standard techniques for dealing with inappropriately named files that look like options to a command but are actually files. The standard requirement for these tricks is for rm -f ./-- or...
How to get previous version using git and VS Express for web 2013?
You can get a specific version via git checkout [commit_id]. You can undo that commit with git revert [commit_id].
git add all tracked files - also those in parent directory
The latest version of git (2.4.3) should do this already. From man 1 git-add: -u, --update Update the index just where it already has an entry matching <pathspec>. This removes as well as modifies index entries to match the working tree, but adds no new files. If no <pathspec> is...
Is it possible to connect to remote DB while working in localhost?
Yes, of course it is. You'll need to whitelist your development servers on the remote server's firewall and allow remote access to the database. If you're using cPanel, there are options there to do so, but you may need to speak to your host as well.
git ssh doesn't work
You are using HTTPS protocol instead of SSH. Change url of the repository to [email protected]:fifiteen82726/MFA.git Ex. command git remote set-url origin [email protected]:fifiteen82726/MFA.git Here's the GitHub help page describing how to get addresses for different protocols https://help.github.com/articles/which-remote-url-should-i-use/...