git

commit & push to remote git repo via webhook?

I want to commit to a git repo from app-engine via webhooks. I cannot install git on appengine. Possible? I think it should be on GitHub, because they have a browser based text editor which can commit via the browser. E.g. go here and click the edit button. GitHub api docs imply read-only operations which doesn't seem to be true. Also...

git autodeploy script within post-receive hook on ubuntu

I have an autodeploy bash script to get updated repo to /tmp in 'post-receive' hook on gitosis #!/bin/bash PWD=$PWD REPO_NAME=${PWD##/*/} cd /tmp git clone git@atom-desktop:$REPO_NAME But anytime when I push repository I got error like this: Host key verification failed. fatal: The r...

Version Control: Managing Common Component Source

How do you manage common library source in a DVCS? Currently, my team uses Perforce to manage our software projects. Using Perforce's "Workspace Mapping" feature, I am able to easily map common library source into dev application directories in a way that keeps the transformation between source management and dev project work transpare...

Git is not restoring the working branch when switching branches

I have an issue where I want to branch off from an old revision but the check out of that branch is not removing files and folders that were only added after that branch in the revision history. Why is this, and how can I got back to a point in the revision history and check out the entire project restoring the state exactly as it appea...

Git: Recover deleted (remote) branch

I need to recover two Git branches that I somehow deleted during a push. These two branches were created on a different system and then pushed to my "shared" (github) repository. On my system, I (apparently) retrieved the branches during a fetch: ~/myfolder> git fetch remote: Counting objects: 105, done. remote: Compressing objects: 1...

not understanding git shallow clone

I have a repo that is about 24MB in size but the files in the project are actually just around 2MB. I was under the impression that a shallow clone with --depth 1 would pretty much get me down close to the 2MB of the actual files (sans entire repo). When I do the shallow clone the new repo shows only the current branch but the size is ...

LVDiff not working in Git

I'm trying to get lvdiff from meta-diff suite to work with Git. My .gitconfig looks like this: [gui] recentrepo = C:/Users/Tanner/Desktop/FIRST 2010 Beta/Java/LoganRover [user] name = Tanner Smith email = [email protected] [merge "labview"] name = LabVIEW 3-Way Merge driver = 'C:/Program Files/National Instrum...

git-shell equivalent of svnserve -r?

I'm trying set up a git repository on a shared hosting account that can be accessed by both me and a friend. I have successfully done this with a Subversion repository by adding this line to ~/.ssh/authorized_keys: command="/usr/bin/svnserve -t -r /path/to/svn/repo \ --tunnel-user=myfriend",no-port-forwarding,no-agent-forwarding,\ n...

How to cherry pick a range of commits and merge into another branch

Hi, I have the following repository layout: master branch (production) integration working What I want to achieve is to cherry pick a range of commits from the working branch and merge it into the integration branch. I pretty new to git and I can't figure out how to exactly do this (the cherry picking of commit ranges in one operati...

Hudson git doesn't merge into master

I'm having problems getting hudson to checkout my git repo and merge into master. I'm fairly inexperienced with Git so the terminology (refs etc...) is still all new to me. I've included the output from the Hudson console below: What I think is happening is that Hudson is checking out the master branch on the remote, but not merging i...

Git post-receive - how to check if pushed branch is merged with master

Hi In our team we are usually pushing all tasks into separate branches, and after that release-manager review those branches and merge them into 'master' branch Sometimes team-members forget to merge their branches with master branch(before pushing) - so what I'm trying to do is - output a message "Please merge with master" after user ...

Publishing partial git history

I would like to publish my git history to a public repository but would like to remove older commits. All the ways I have seen to do this alter the newer commit's SHA1s, which is not an option since I want to be able to push to the modified repo. Is there anyway to do this ? ...

Can an external directory be added to an existing git repository

I have an existing git repository with a reasonable amount of history that I don't want to lose. The problem is that I would like to add directories that are above the current git root dir. I know that the following wont work: git add ../[dir]/[filename] It would seem that I need to do an export/import to get this working. Can anyb...

How to work on a Cocoa app and plugins in parallel?

I have a relatively simple goal: I want to create a Cocoa application which doesn't have much functionality itself, but is extendable through plugins. In addition I want to work on a few plugins to supply users with real functionality (and working examples). As I am planning to make the application and each plugin separate open-source p...

git-ignoring files based on remote?

Hi all, Is it possible to ignore specific files in git only for certain remotes? e.g., I'm storing AWS S3 credentials (s3.yml) in a file for an app hosted on Heroku, thus I need to check s3.yml into my repo for the deploy to work. However, I'd like to publish the source to GitHub as well, so I would be wise to keep s3.yml out of the r...

git - how to commit partial changes

Say there are several files modified and I just want one files committed each time. How to do that? Given an example with status looks like below. Thanks!! Ex: > git status # modified: file01.txt # modified: file02.txt # modified: file03.txt # modified: file04.txt # modified: file05.txt ...

How do I delete a Git branch both locally and in Github?

I created a bugfix branch to fix a bug on a project that I had forked on Github. I gave a pull request to the developer to incorporate my fix, but the developer decided to implement a different fix for the problem. At this point, I want to delete the bugfix branch both locally and on my project fork on Github. Successfully Deleted Local...

How to permanently delete a file stored in GIT?

I backed up my database to GIT just so I could get the db at my home computer. I don't want this file to be versioned, it was just a 1 time thing really. Can I delete it for good so GIT doesn't keep track of it going forward or historically? ...

Git: Moving trunk into a branch and starting over?

Newbie with git here. I have a Remote Repository, cloned on my PC. It's on the master branch and git push/pull to the remote works. Now, I want to completely start over, but keep the repository. I would like to move the current master branch into a new branch and clone that separately (so that I have it and can even still work on it) an...

Git is slow on startup

Hi, I have a small problem with git in my pc, I create a new folder and i start Git Bash, but it takes so long for it load git, as in it will show the command prompt but it need a while for the git line to show up. Any clue on this? Thanks ...