tags:

views:

229

answers:

1
+4  Q: 

git workflow for making modifications you'll never push back to origin

Git newbie here.

I'm building an iPhone app with PhoneGap, which has a Git repos. I'd like to keep track of my changes to the PhoneGap code (mainly, adding files to the www directory) in my own Git repository, while being able to pull the latest and greatest out of PhoneGap.

What's the best way of doing this? Is this what a branch is intended for?

Also, how would I get it to ignore the fact that I deleted folders I don't need, like the android/ and blackberry/ folder?

+4  A: 

This is exactly what a branch is for. You should work on your branch, and pull changes from the main branch, possibly using --rebase.

Can Berk Güder  2009-02-24 14:51:35
How will this handle things like me renaming files? If I do a git rename on a file, will a rebase from the main branch apply updates to the renamed file, or will it create the file again with the old name?
ceejayoz  2009-02-24 15:07:06
Whether you rebase or not, a rename will most likely result in a merge conflict, which you'll have to resolve manually.
Can Berk Güder  2009-02-24 16:04:19
If you commit file renames without a lot of changes to thsose files in the same commit, you are unlikely to get any merge conflicts.
Paul  2009-02-24 16:58:43
@Paul: even the smallest change resulted in a merge conflict in my test.
Can Berk Güder  2009-02-24 17:09:40

related questions

How to have two remote orgins for Git?
Why is branching and merging easier in Mercurial than in Subversion?
Is there a better way of writing a git pre-commit hook to check any php file in a commit for parse errors ?
Bug tracker setup with Git integration?
Does git have anything like `svn propset svn:keywords` or pre-/post-commit hooks?
git-stash vs. git-branch
Git "bad sha1 file" error
Should I use GitHub+Fogbugz or Assembla?
How do you remove a specific revision in the git history?
How do you organise multiple git repositories?
What is the Difference Between Mercurial and Git?
How do I restore files to previous states in git?
Is there anything like TortoiseCVS and TortoiseSVN for git?
Good Git repository viewer for Mac
Deploying a Git subdirectory in Capistrano
How to "unversion" a file in either svn and/or git
How can I graph the Lines of Code history for git repo?
Switch branch names in git
Migrating to GIT
How can I set up an editor to work with Git on Windows?
How do you deal with configuration files in source control?
Undoing a git reset --hard HEAD~1
Version Control. Getting started...
Why is Git better than Subversion?
Distributed source control options