Search Results

Search found 2956 results on 119 pages for 'git rebase'.

Page 38/119 | < Previous Page | 34 35 36 37 38 39 40 41 42 43 44 45  | Next Page >

• Parent/master project in git

  - by jriff

  I have a project "A" that is a Git repository. I would like to be able to make multiple copies of project A (B and C), and modify them for clients. "A" is the master so sometimes when I do new functionality i would like to be able to pull them into B or C. But some commits should just stay in A and only be used if making a new clone. How do I do that with Git? That is: how to copy A? (Clone?) how to get specific commits into B and C? Please keep in mind that this all happening locally - not on GitHub. I use OS X.

  Read the article

• Learning about version control systems, Git, SVN

  - by anijhaw

  I am a basic SVN user now trying to learn GIT for a new position. I am trying the usual reading docs and watching videos. However after doing all that I still feel that there is a lot that I do not know. I was wondering if there is a place like project Euler for programming languages, that provides a series of exercises that you can do just to increase your confidence and test your knowledge about a version control system. Something thats generic enough and gets you up to speed with how to do basic things. This could also serve as a comparison point of sorts between multiple VCSs, that would show what things are easy in which VCS. If there is nothing I was planning to document my journey in learning GIT and the create an exercise of this sort.

  Read the article

• Git Use Remote Source Durring Push

  - by ThinkBohemian

  I have a local git repository a "central" repo at github. I'm working on a part of a project, while a friend is working on a related piece that is its entirely seperate repo, is it possible for me to simply link directly to my friends repo? For example, the app is called widgets. I have all my code in widgets/app/mycode and my friend is writing code that goes into widgets/plugins/awesome/hiscode. I want to be able to always have http://github.com/mycode/widgets/plugins/hiscode to be a direct link or clone to http://github.com/hiscode/awesome ? It could be possible i'm missing something basic in my question or knowledge of git, if so please ask, and i'll be happy to try to fill in the blanks. I am deploying to my production site via capistrano, so maybe a script of some kind may be easier?? I don't know (that's why i'm posting)!!

  Read the article

• Massive git commit squashing

  - by Nycto

  My company is in the middle of converting from CVS over to git. We've been on CVS for a long time, so there is a huge history. Too much to do by hand. Looking at the logs, there is a lot of squashing that could be done. A whole lot. What I would like to do is hook in a script that will compare two adjacent commits. If it returns true, then concatenate the commit messages and squash the commits. I would also be happy with a command that accepts two commits and a commit message, then squashes them together. git rebase --interactive is close to what I need, but "squash" requires far too much manual intervention. I also looked at using "fixup" instead of squash, but I don't want to lose the commit messages. Any ideas?

  Read the article

• Working with git from 2 laptops with no bare repo

  - by matiit

  I've started project in my first laptop. git init, and start working. Tomorrow i'm going to vacations. I want to take with me my smaller laptop. And work with project from time to time. I cloned repository via ssh from bigger laptop (git clone ssh://adress) And when i will back, what is the best way to push changes from smaller laptop to the bigger one? There is no bare repo in bigger laptop. And i want to work with that repo on the bigger laptop later, so i have to do this clear.

  Read the article

• Is there a free private Git repository?

  - by saturngod

  Currently I use http://www.codaset.com/ for a private repository. It's free but it can't be free forever. Codaset is nice git repo and we can write blog and wiki entries in there. I want to use a private repo for my private project. This isn't a commercial project or a big project. I also found http://www.projectlocker.com but the user interface is so poor. So, I want to use something like codaset or github repo, for free at least 1 user and 100 MB git repo.

  Read the article

• Git archive of repository with uncommitted changes

  - by Ton van den Heuvel

  Is it possible to create an archive of my current repository including local uncommitted changes using git archive?

  Read the article

• Git - will the file moves be detected?

  - by Ben Aston

  I performed some modifications on a branch (A). I then decided to create a brand new branch (B) based on the state of my existing working copy and commit and push to that. There were a number of files that had been moved during my earlier refactoring, and hence were now not included in version control having been moved directly in the filesystem. By accident I did not add these files to git before committing and pushing to the new branch (B). If I now add these files and commit and push, will Git be able to detect the file move operations?

  Read the article

• Git doesn't sync files until committed, even if checked out in a different branch

  - by DertWaiter

  Okay, I have git 1.7.11.1 on Windows and I have a local test repository with 2 branches. One is master with index.php and help.php. I then create another branch called slave :) I run from git bash rm help.php and it disappears from the folder, but I don't stage anything. I switch to checkout master branch and it is supposed to restore file help.php because it is not modified in the master branch, isn't it? And it does not do it. When I go back to the slave branch and commit and then switch to checkout master then help.php appears. Is that the way it is supposed to to work? Why?

  Read the article

• git divergent renaming

  - by pablo

  Hi, I'd like to know how you handle a situation like this in Git: create branch task001 from master master: modify foo.c and rename it to bar.c task001: modify foo.c and rename it to moo.c merge task001 to master What Git tells me is: CONFLICT (rename/rename): Rename "foo.c"->"bar.c" in branch "HEAD" rename "foo.cs"->"moo.c" in "task001" Automatic merge failed; fix conflicts and then commit the result. How should I solve it? I mean, I still want to merge the two files once the name conflict is resolved. Thanks.

  Read the article

• What to add to git repo?

  - by Ryan

  I am doing a video player. I have the following in my project folder: these four dirs should each be on their own line: /source /sample_applications /images /videos Right now the repo just includes the /source directory...which is code only. It is on my local computer. I am thinking of adding it to git hub. My question is: should I add the sample apps, the images and the videos to the repo? Is that something that people normally do and that other people want people to do? Can git even handle videos(noob here)?

  Read the article

• Git rebase and semi-tracked per-developer config files.

  - by dougkiwi

  This is my first SO question and I'm new-ish to Git as well. Background: I am supposed to be the version control guru for Git in my group of about 8 developers. As I don't have a lot of Git experience, this is exciting. I decided we need a shared repository that would be the authoritative master for the production code and the main meeting-point for the development code. As we work for a corporation, we really do need to show an authoritive source for the production code at least. I have instructed the developers to pull-rebase when pulling from the shared repository, then push the commits that they want to share. We have been running into problems with a particular type of file. One of these files, which I currently assume is typical of the problem, is called web.config. We want a version-controlled master web.config for devs to clone, but each dev may make minor edits to this file that they wish to locally save but not share. The problem is this: how do I tell git not to consider local changes or commits to this file to be relevent for rebasing and pushing? Gitignore does not seem to solve the problem, but maybe that's because I put web.config into .gitignore too late? In some simple situations we have stacked local changes, rebased, pushed, and popped the stack, but that doesn't seem to work all of the time. I haven't picked up the pattern quite yet. The published documentation on pull --rebase tends to deal with simplier situations. Or do I have the wrong idea entirely? Are we misusing Git? Dougkiwi

  Read the article

• git squash and preserve last commit's timestamp

  - by Crend King

  Consider I have commits ... -- A -- B -- C If I use git rebase -i to squash all three commits into one, we could pick A squash B squash C I see the resulted commit A has its original timestamp. How could make it inherit the timestamp of commit C (the last one)? What I can think of is git commit --amend --date=<new_time>, but I need to remember the timestamp of commit C before squash or from reflog. I find the timestamp of the latest timestamp is more reasonable, because it show when do I actually finish the work that are in the commits. Thanks.

  Read the article

• What git gotchas have you been caught by?

  - by Bob Aman

  The worst one I've been caught by was with git submodules. I had a submodule for a project on github. The project was unmaintained, and I wanted to submit patches, but couldn't, so I forked. Now the submodule was pointing at the original library, and I needed it to point at the fork instead. So I deleted the old submodule and replaced it with a submodule for the new project in the same commit. Turns out that this broke everyone else's repositories. I'm still not sure what the correct way of handling this situation is, but I ended up deleting the submodule, having everyone pull and update, and then I created the new submodule, and had everyone pull and update again. It took the better portion of a day to figure that out. What have other people done to accidentally screw up git repositories in non-obvious ways, and how did you resolve it?

  Read the article

• Find a specific couple of lines of code from large git repo

  - by mustISignUp

  So i remember that i once did something in another project and (later removed it), that could be useful now. Thanks to some other SO post i managed to search for a half remembered string.. git grep halfRemeberedNameOfFunction $(git log -g --pretty=format:%h) and Yay! got some results 2d0bcde:path/to/project/file.c: result = halfRemeberedNameOfFunction( data ); 65fc672:path/to/project/file.c: result = halfRemeberedNameOfFunction( data ); 24f2858:path/to/project/file.c: result = halfRemeberedNameOfFunction( data ); 252e3a5:path/to/project/file.c: result = halfRemeberedNameOfFunction( data, args ); b58bc0b:path/to/project/file.c: result = _halfRemeberedNameOfFunction( data, options ); dce8d9d:path/to/project/file.c: result = halfRemeberedNameOfFunction( data, moreData ); But how do i get that file at one of those revisions? Many thanks

  Read the article

• Parant/master project in git

  - by jriff

  Hi all I have a project "A" that is a Git repo. I would like to be able to make multiple copies of project A (B and C), and modify them for clients. "A" is the master so sometimes when I do new functionality i would like to be able to pull them from B or C. But some commits should just stay in A and never leave :-) How do I do that with Git? That is: how to copy A? (Clone?) how to get specific commits into B and C? Please keep in mind that this all happening locally - not on GitHub. I use OS X. Regards, Jacob.

  Read the article

• Alter Git prompt on Windows

  - by kko

  I'm using Git on Windows, installed through GitExtensions with MSysGit (latest) having selected "do not modify my Windows prompt" during installation. Now, I would like to be able to modify the default prompt (which by default shows just the branch name to also show me how much time, and how many local commits since I last pushed to origin (or specifically origin/master, whichever is easier). So say instead of: me@myPC /c/myRepo (master) I would see something along the lines of: me@myPC /c/myRepo (master) 5 | 10:20 meaning I have last pushed 10h 20min ago and I have made 5 local commits since. Before you mention it, I am aware there are ways of doing it with PowerShell, but I don't want to use it. I want my standard git bash we all know and love. I found a few solutions to that, with modifying PS1 variable in .bashrc file, but (excuse my poor Unix konwledge) they seem to be not working, (for example accepted answer to this question). So there you have it. Is this possible?

  Read the article

• How Do I Fix Merge Conflicts in Git?

  - by Spoike

  Do you know a good way to explain how to resolve merge conflicts in git?

  Read the article

• Revert to previous Git commit

  - by Crazy Serb

  How do I revert from my current state to a snapshot made on a certain commit? If I do git log, I get the following output: [root@me dev]# git log commit a867b4af366350be2e7c21b8de9cc6504678a61b` Author: Me Date: Thu Nov 4 18:59:41 2010 -0400 blah blah blah... commit 25eee4caef46ae64aa08e8ab3f988bc917ee1ce4 Author: Me Date: Thu Nov 4 05:13:39 2010 -0400 more blah blah blah... commit 0766c053c0ea2035e90f504928f8df3c9363b8bd Author: Me Date: Thu Nov 4 00:55:06 2010 -0400 And yet more blah blah... commit 0d1d7fc32e5a947fbd92ee598033d85bfc445a50 Author: Me Date: Wed Nov 3 23:56:08 2010 -0400 Yep, more blah blah. How do revert to the commit from November 3?

  Read the article

• How to get change history for a specific file in git repository

  - by macek

  I would like to do something like: git history my_file possible output 2010-05-16 + add this line + more code here 2010-05-15 + delete code below - bad code - more bad codd 2010-05-12 + changes made here

  Read the article

• Git: Make one branch exactly like another

  - by G. Martin

  I am relatively new to Git, and I'm still not very comfortable with it. Right now, I'm looking for the command/options/magic that can make the current branch look like another branch; that is, to merge them, but when a conflict arises, to always choose the difference in the branch that is being merged into the current one. My situation is thus; I have an stable(ish) application on the "master" branch. I also have another branch, called "feature". I basically want to make changes/additions/deletions to feature until I like the new feature I'm working on. Once I feel it is ready, I want to make the master branch look identical to the feature branch. I know this probably isn't a best practice, but as I said, I'm new to Git. I plan on learning how to do more complicated things in the future, but for now, this is all I need. Thanks, SO!

  Read the article

• Visualizing branch topology in git

  - by Benjol

  I'm playing with git in isolation on my own machine, and even like that I find it difficult to maintain a mental model of all my branches and commits. I know I can do a git log to see the commit history from where I am, but is there a way to see the entire branch topography, something like these ascii maps that seem to be used everywhere for explaining branches? .-A---M---N---O---P / / / / / I B C D E \ / / / / `-------------' It just feels like someone coming along and trying to pick up my repository would have difficulty working out exactly what was going on. I guess I'm influenced by AccuRev's stream browser...

  Read the article

• Can git be integrated with Xcode?

  - by Gordon Wilson

  Is there any way to use a git repository with the built in SCM functions of Xcode?

  Read the article

• Hosting Private Git repos on my own server?

  - by Stoic

  Hey, I am looking for a way to host private git repos on my own server. I am using Github for Open source projects of mine, but I would prefer to use my own server for storing private git repos. Can someone suggest me on which script should I be using for this purpose. Trac is not what I am looking for, though. I want something that is, preferably PHP based solution (just optional) and esp. something that has an easier UI. Any help is appreciated here.

  Read the article

• Advantages of GitHub over Bitbucket for Git Repositories [closed]

  - by rolve

  Now that Bitbucket also supports Git repositories, it seams to me that it is a good alternative to GitHub, especially since its free plan includes unlimited private repositories, which is not available on GitHub. Yet, GitHub seams much more popular. Are there any major reasons to choose GitHub as the hosting site for Git repositories instead of Bitbucket? (Although I have no problems with making my personal projects publicly available in general, I like the idea of being able to make the switch from public to private or vice versa any time I want. But if there are some good reasons to use GitHub, I would be willing to give up this freedom.)

  Read the article

< Previous Page | 34 35 36 37 38 39 40 41 42 43 44 45  | Next Page >