Search Results

Search found 5564 results on 223 pages for 'git svn'.

Page 77/223 | < Previous Page | 73 74 75 76 77 78 79 80 81 82 83 84  | Next Page >

• Programmatically printing git revision and checking for uncommitted changes

  - by Andrew Grimm

  To ensure that my scientific analysis is reproducible, I'd like to programmatically check if there are any modifications to the code base that aren't checked in, and if not, print out what commit is being used. For example, if there are uncommitted changes, it should output Warning: uncommitted changes made. This output may not be reproducible. Else, produce Current commit: d27ec73cf2f1df89cbccd41494f579e066bad6fe Ideally, it should use "plumbing", not "porcelain".

  Read the article

• Simple github fetch/merge not pulling in remote branch?

  - by chum of chance

  I have a project I forked on github to my repository. I made changes on the "experiment" branch of the project the committed the project to my fork. If you go to my branch on Github you can see the that the experiment branch was correctly committed. I would like to merge the experiment branch with the original repo (which I have rights to). I issued the following commands: git clone [email protected]:originalrepo/theproject.git git checkout -b experiment origin/experiment cd theproject git remote add experiment [email protected]:chumofchance/theproject.git git fetch experiment git merge experiment "Already up to date" However, when I view the project in explorer, it appears that nothing has changed. Am I screwing something up in regards to fetching the experiment branch (vs the master branch)?

  Read the article

• Git: Finding what branch a commit came from

  - by Ethan Gunderson

  I'm pretty sure this isn't possible, but is there anyway to find out what branch a commit comes from given its sha1? Bonus points if you can tell me how to accomplish this using grit. :)

  Read the article

• Git tool to remove lines from staging if they consist only of changes in whitespace

  - by Max Howell

  The point in removing trailing whitespace is that if everyone does it always then you end up with a diff that is minimal, ie. it consists only of code changes and not whitespace changes. However when working with other people who do not practice this, removing all trailing whitespace with your editor or a pre-commit hook results in an even worse diff. You are doing the opposite of your intention. So I am asking here if there is a tool that I can run manually before I commit that unstages lines from staging that are only changes in whitespace. Also a bonus would be to change the staged line to have trailing whitespace removed for lines that have code changes. Also a bonus would be to not do this to Markdown files (as trailing space has meaning in Markdown). I am asking here as I fully intend to write this tool if it doesn't already exist.

  Read the article

• "No SCM found" error on Coda.app with Changes.app plugin

  - by Luis Martins

  I was trying to verify changes on a file between two commits. This works fine both in Espresso and Textmate but in Coda i always get this error "No SCM found". Can anyone suggest what to look for?

  Read the article

• Git: removing selected commits from repository

  - by xk0der

  I would like to remove selected commits from a linear commit tree, so that the commits do not show in the commit log. My commit tree looks something like: R--A--B--C--D--E--HEAD I would like to remove the B and C commits. So that they do not show in the commit log, but changes from A to D should be preserved. Maybe by introducing a single commit, so that B and C become BC and the tree looks like. R--A--BC--D--E--HEAD Or, ideally, after A comes D directly. D' representing changes from A to B, B to C and C to D. R--A--D'--E--HEAD Is this possible? if yes, how? Some notes that might be helpful: This is a fairly new project so has no branches as of now, hence no merges as well. Side note: It's a personal project, so no, I'm not trying to destroy any evidence :)

  Read the article

• How should I structure my git commits?

  - by int3

  I'm trying to contribute to open source software for the first time, but I'm pretty inexperienced with version control systems. In particular, right now I want to make a number of changes to different parts of the code, but I'm not sure if the maintainer would want to integrate all of them into the master repository. However, the changes I'll be making are independent, i.e. they affect different parts of the file, or parts of different files. How should I go about making the changes? If I make a string of commits on the same branch, will the maintainer be able to pick and choose what he wants from the individual commit? E.g. can he patch in the changes I made in my second commit while ignoring the first one? Or should I make each change in a separate branch?

  Read the article

• git (any SCM) and compiling object files, switching branches, physiology thereof

  - by IanVaughan

  If I compile branch A, then switch to branch B, compile, and switch back to branch A. All the object files touched by the compile of branch B have to be recompiled! Normally one does not check-in object files, but there seems little choice here. What are the ideal working practices here?

  Read the article

• How to break a series of git commits into patches for submission to another project

  - by krosenvold

  So I've been bashing away at my favorite open source project for quite some time, and It's time for submitting issues with patches back. I have to regroup my commits more or less fully, and hopefully extract some pieces of code that can function as distinct patches to avoid code bombing. Currently I usually do something like this: rebase/squash everything to one commit since the old ones often don't make sense as patches undo that commit start adding stuff that I think fits to one commit, using add/add -i commit stash the rest test that commit re-apply the stash and start from 3 until all is accounted for It works, but is there a better way ?

  Read the article

• Git Submodule or fork

  - by Eric

  I have a private repo in github that is the complete source code to my cms. Now I have a few local customers that I want to use the same code base on but with different themes. Is it better to fork the original project out into a repo for each one. Or use a submodule and create a new repo for each customer? After each site is complete I would imagine the theme files wouldn't change much but would need to pull in changes from the main repo when bugs are discovered.

  Read the article

• Git: Run through a filter before commiting/pushing?

  - by martiert

  Hi. Is there a way to run the changed files through a filter before doing the commit? I wish to make sure the files follows the coding standards for the project. I would also like to compile and run some test before the commit/push actually takes place, so I know everything in the repo actually works.

  Read the article

• How do I fix these spurious git commits?

  - by James Wenton

  I made an error when I was working and wound up with a commit tree I didn't want. Right now, things look like this: [master] A -- B -- C -- D \ \ C' -- D' [HEAD] I want to wind up like this: [master, HEAD] A -- B -- C -- D How do I get there from here?

  Read the article

• Sharing code between two different git projects

  - by ripper234

  I have two different .Net projects, hosted on github. I would like to create a shared "commons" library for the two projects. How should I structure my repository to facilitate this sharing? Ideally, a change in this common library in one project could easily be pushed into the other project. I prefer to keep the code itself editable from the two projects (within Visual Studio), and not include it as a library. Are there best practices for this?

  Read the article

• How to commit my current changes to a different branch in git

  - by Auron

  Sometimes it happens that I make some changes in my working directory and I realize that these changes should be committed in a branch different to the current one. This usually happens when I want to try out new things or do some testing and I forget to create a new branch beforehand, but I don't want to commit dirty code to the master branch. So, how can I make that uncommitted changes (or changes stored in the index) be committed to a different branch than the current one?

  Read the article

• Syncing two GIT branches that only differ by a couple of files

  - by Oliver Weichhold

  I have a couple of branches defined for the current project where all but the master branch differ from master only by the same small set of files (less than ten). After implementing a new feature in master I would like to replicate those changes and additions to the other branches with the least effort. What's the recommended approach here?

  Read the article

• How do you pronounce Git?

  - by The Matt

  With regards to the version control system, is it pronounced 'get' or 'jit'?

  Read the article

• Understanding Git's version control

  - by georgeliquor

  Is there a way to go through different commits on a file. Say I modified a file 5 times and I want to go back to change 2, after I already committed and pushed to a repository. In my understanding the only way is to keep many branches, have I got that right? If I'm right I'm gonna have hundreds of branches in a few days, so I'm probably not understanding it really. Could anyone clear that up please?

  Read the article

• Rebasing a core repo in git.

  - by b. e. hollenbeck

  I have a customized fork of CodeIgniter that I use as a standard baseline for several projects. Recently, I've made significant improvements in this repo that I want to use to update the client projects that use it. What I can't seem to figure out is how to pull in the changes to a client project. So I have: Baseline: A--B--C--D--E Client cloned @ C C'--D'--E' And I want to update the client repo to E from the Baseline project. I've tried rebase, and it has erased the files not present in the baseline project (views and such), and creates a bunch of conflicts that really don't need to be conflicts with things like the default HTML5 boilerplate that I use. Is there an option for rebase that I should be using? Is there a different way to approach it? Do I need a bunch of .gitignores for the content directories?

  Read the article

• Git workflow idea to push an unfinished local branch to remote for backup purposes

  - by Zubin

  Say I'm currently working on a new feature which I've branched off of the 'dev' branch and I've been working for several days and it's not yet ready to be merged with 'dev' and pushed. Although I have made several commits and have been pulling changes to dev and then merging dev into my feature branch to keep myself updated. Here's my question. Is it a good idea to push my feature branch to a new branch (with the same name as my local branch) onto origin (say GitHub) just for back-up purposes and later on when it's merged into 'dev' and/or 'master' delete it from origin.

  Read the article

• How to merge two branches with the Mac OS X git client Gity

  - by Marijn Huizendveld

  I'm having trouble merging two branches with Gity. When I do a checkout on my master branch and click: "Merge into master" nothing seems to happen... Any thoughts?

  Read the article

• Git: committed to wrong branch

  - by Sleepycat

  D'oh! I just made a perfectly good commit to the wrong branch. How do I undo the last commit in my master branch and then take those same changes and get them into my upgrade branch? Thanks!

  Read the article

• GIT core.editor setup on windows along w application PATH reference

  - by delinquentme

  Hey all so i wehnt ahead and opened up my .gitconfig file and manually input the [core] editor = 'C:/Program Files/Notepad++/notepad++.exe' which would allow me to execute command: (im trying to setup my .gitignore list) "C:/Program Files/Notepad++/notepad++.exe" .gitignore im JUSt not interested in typing this out every time that i need to make a file SO ive heard something about editing PATH to allow me to replace the above with something like: npp .gitignore any help would be aprpeciated!

  Read the article

• Adding folders to a git repository while ignoring some subfolders

  - by madmaze

  Im trying to add a directory "foo" to my repo, but there are some sub dirs lets call them "bar1", "bar2", "bar3" and "bar4" Now I want to add foo to my repo, while ignoring foo/bar2 and foo/bar3 is this possible? do i need to add them first and then remove the folders I dont want?

  Read the article

• Convert a two-parent commit into a single-parent one in git

  - by Auron

  Oops! It seems I did something wrong the last time I merged two branches in my repository: This was far from what I was expecting. Is there a way to arrange this mess and obtain something like the following? What did I did wrong?

  Read the article

• Git ignore all folders apart from

  - by digital

  I want to ignore all the files in my folder structure apart from the following conditions: profiles (and all folders/files recursive) sites/xxx (and all folders/files recursive) Currently my gitignore file looks like: `*` !sites/xxx !sites/xxx/modules !sites/xxx/modules/* !profiles !profiles/xxx !profiles/xxx/* This doesn't allow me to track sites/xxx/modules/new though, is there anyway round this.

  Read the article

< Previous Page | 73 74 75 76 77 78 79 80 81 82 83 84  | Next Page >