Search Results

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

Page 36/223 | < Previous Page | 32 33 34 35 36 37 38 39 40 41 42 43  | Next Page >

• Git already up to date unless I reset

  - by Chris

  I have a cloned repo I use for the live site and I have it pull from a bare repo. For some reason every time I execute "git pull" I get the already up to date message. But it's not up to date and not updated. If I do a git reset --hard HEAD^ and then git pull again, the changes come in. What's the problem here and how do I fix it so that git pull will pull and merge changes in without needing a hard reset?

  Read the article

• Textbased issue-tracker/todo list for Git?

  - by anon

  I've been managing all of my todo-lists as ~/git-repo/todo which is kept under git. THen I add/delete files from the todo list, and have git autocommit all changes. However, I feel there should be more powerful tools. Besides "cil" and git-issues [neither of which I've tried], what tools are available? PS I want something that's entirely text/command line based. Thanks!

  Read the article

• git merge should ignore one directory

  - by dorelal

  I have tons of data in directory called reports. While doing git merge with another branch I am getting lots of conflicts for files under reports directory. I would like git merge to ignore files under reports. In another words I would like all the data from reports from master and not from lab branch. Is that possible? This is what I am doing right now. git checkout master git merge lab

  Read the article

• Can't git fetch through SSH

  - by alamodey

  I've setup a git repository one a remote server. Now I'm trying to checkout from it with: git fetch ssh://[email protected]/~username/workfolder/ but I get an error: fatal: Not a git repository What am I doing wrong? Could it be the server does not support Git+SSH?

  Read the article

• Simplify a batch of git commands

  - by Bogdan Gusiev

  When I want to merge one branch to another I use to do the following(in this example master to custom): git checkout master && git pull && git checkout custom && git merge master Can somebody suggest how to simplify this? Thanks, Bogdan.

  Read the article

• Strange git case...

  - by khelll

  I have a file, let's say file.txt I have done git mv file.txt to file1.txt, then I created a new file called file.txt and worked on it, unfortunatly I didn't add that file to git yet. Anyway the problem is that I did git stash, then git stash apply, but the new file.txt disappeared... anyway to get it back?

  Read the article

• git encrypt/decrypt remote repository files while push/pull

  - by UncleMiF

  Is it possible to automatically encrypt files via 'git push' before transferring to a remote repository? And automatically decode them while 'git pull'. I.e, if I have some remote server with shared access with git repository there, and I don't want to our project was stolen without a permission... Maybe there is some special git-hooks before push and after pull?

  Read the article

• Is this scatter-brained workflow realizable in Git?

  - by Luke Maurer

  This is what I'd like my workflow to look like at a conceptual level: I hack on my new feature for a while I notice a typo in a comment I change it Since the typo is completely unrelated to anything else, I put that change in a pile of comment fixes I keep working on the code I realize I need to flesh out a few utility functions I do so I put that change in its own pile Steps 2, 3, and 4 each repeat throughout the day I finish the new feature and put the changes for that feature in a pile I push nice patches upstream: One with the new feature, a few for the other tweaks, and one with a bunch of comment fixes if enough have accumulated Since I'm both lazy and a perfectionist, I want to be able to do some things out of order: I might correct a typo but forget to put it in the comment fix pile; when I prepare the upstream patches (I'm using git-svn, so I need to be pretty deliberate about these), I'll then pull out the comment fixes at that point. I might forget to separate things altogether until the very end. But I might /also/ have committed some of the piles along the way (sorry, the metaphor is breaking down …). This is all rather like just using Eclipse changesets with SVN, only I can have different changes to the same file in different piles (having to disentangle changes into different commits is what motivated me to move to git-svn, in fact …), and with Git I can have my full discombobulated change history, experimental branches and all, but still make a nice, neat patch. I've just recently started with Git after having wanted to for a good while, and I'm quite happy so far. The biggest way in which the above workflow doesn't really map into Git, though, is that a “bin” can't really be just a local branch, since the working tree only ever reflects the state of a single branch. Or maybe the Git index is a “pile,” and what I want is to have more than one somehow (effectively). I can think of a few ways to approximate what I want (maybe creative use of stash? Intricate stash-checkout-merge dances?), but my grasp on Git isn't solid enough to be sure of how best to put all the pieces together. It's said that Git is more a toolkit than a VCS, so I guess the question comes down to: How do I build this thing with these tools?

  Read the article

• How do I remove sensitive files from git's history

  - by Stefan Liebenberg

  I would like to put a git project ( Rails app ) on github, but it contains certian files with sensitive data ( usernames and passwords, like /config/deploy.rb for capistrano ). I know I can add these filenames to .gitignore, but this would not remove the their history within git. I also don't want to start over again by deleting the /.git directory. Is there a way to remove all traces of a particular file in your git history?

  Read the article

• Using the slash character in Git branch name

  - by faB

  I'm pretty sure I saw somewhere in a popular Git project the branches had a pattern like "feature/xyz". However when I try to create a branch with the slash character, I get an error: $ git branch foo/bar error: unable to resolve reference refs/heads/labs/feature: Not a directory fatal: Failed to lock ref for update: Not a directory Same problem for (my initial attempt): $ git checkout -b foo/bar How does one create a branch in Git with the slash character?

  Read the article

• When does post-update get called (GIT)

  - by Michael

  My git setup was working beautifully, then stopped cooperating today. Right now, I can git-pull, git commit just fine from my local machine. When I git push, the push goes through, but the server files don't actually get updated. Now I wonder, is my post-update file even getting called anymore? I've checked the permissions, and they are all group +x, and I'm a part of the group... any other suggestions?

  Read the article

• Storing a repository in subversion and git

  - by Ceilingfish

  Hi, I'm currently trying to convince my company to migrate to git from subversion, and one thing that would be really helpful would be to allow me to store a repository in subversion and git at the same time (then I can show them how easy it is to do in git what they've spent an hour trying to do in subversion). I guess that I could put my subversion repository straight into git, but this seems to leave loads of .svn artifacts in each directory. Does anyone know if there's a way to avoid this?

  Read the article

• Error when doing git pull, unable to resolve

  - by nubela

  Hi, I'm getting this git error and I don't really get what it means, nor how I can fix it: (v_env)[nubela@nubela-desktop searchplus]$ git pull origin master From file:///home/nubela/Workspace/_git/searchplus * branch master -> FETCH_HEAD Updating 38f3d5b..fe6028c error: Untracked working tree file 'searchplus/.project' would be overwritten by merge. Aborting (v_env)[nubela@nubela-desktop searchplus]$ I've done the following but to no avail: git clean -f -d git reset --hard HEAD Anyone can help enlighten me? Thanks :)

  Read the article

• Git : How to revert bulk commits on multiple repos

  - by Rachel

  To update my multiple repos, I did: git bulk fetch origin git bulk pull origin master Now it appears that some of the functionality which was working initially is not working now and so I want to revert back to previous state of my repos. How can this be done ? I tried doing git reset --soft commit id & git reset --hard commit id for one repos but it is not working. Any suggestions.

  Read the article

• How can I 'git clone' from another machine

  - by hap497

  Hi, In 1 machine (ip 192.168.1.2), I create a git repository by $ cd /home/hap/working $ git init $ (add some files) $ git add . $ git commit -m 'Initial commit' And I have another machine in the same WiFi network, How can I get clone from the other machine? Thank you

  Read the article

• Git is slow on startup

  - by Daniel Mahadi

  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

  Read the article

• How to work with diff representation in git

  - by poseid

  If I make a simple diff in git with e.g.: git diff origin/master where can I find good references on how to read the output of git. The man page on git-diff is rather long, and explains many cases which are maybe not necessary for a start.

  Read the article

• Jump to 'git add -i' patch command (5) directly

  - by felixge

  How can I get "git add -i" to start up in patch mode directly without having to type "5" + Enter? I know about "git add -p", but it's not the same as it doesn't show me a list of files to select from first. This is very annoying because I'd like to jump between "git add -i" and "git commit" very quickly to turn my dirty tree into some nice looking commits.

  Read the article

• does git have functionality lke cvs's rtag

  - by user1663987

  In CVS, we could programatically create a new branch of existing source using the "rtag" command, which did not require a copy of the repository. Does git support functionality of this kind, making a branch of existing files in a remote git repository without having a local copy of it? Or does the distributed nature of git preclude this? (I'm trying to save the 20+ minutes it would take to make a freestanding copy of the repository, just to run a 'git branch' command.)

  Read the article

• What are some cool git or .gitignore tricks & best practices? [closed]

  - by 01walid

  Git is just awesome and fast VCS, however, knowing better this tool will help you incredibly increase your productivity and save your time. Here we can try to make a collection of tips, tricks and useful links to better take advantage of git, this question can have some more sub-questions, I mean: what are some usefull commands that reverse or rectify commits/adding/removing mistakes? what are .gitignore & Global .gitignore best practices? especially with private/secure files that contains passwords, api keys, local config and so on ... .gitignore first or git add <files> first? what are the advantages/disadvantages of both being the first/last. links to blog post, articles, would be sufficient. I thought every sub-question is not worthy opening a whole post each alone, I think centralizing these tips in one question post would help many people.

  Read the article

• Code review process when using GIT as a repository?

  - by Sid

  What is the best process for code review when using GIT? Current process: We have a GIT server with a master branch to which everyone commits Devs work off the local master mirror or a local feature branch Devs commit to server's master branch Devs request code review on last commit Problem: Any bug in code review are already in master by the time it's caught. Worse, usually someone has burnt a few hours trying to figure out what happened... So, we would like To do code review BEFORE delivery into the 'master'. Have a process that works with a global team (no over the shoulder reviews!) something that doesn't require an individual dev to be at his desk/machine to be powered up so someone else can remote in (remove human dependency, devs go home at different timezones) We use TortoiseGIT for a visual representation of a list of files changed, diff'ing files etc. Some of us drop into a GIT shell when the GUI isn't enough, but ideally we'd like the workflow to be simple and GUI based (I want the tool to lift any burden, not my devs).

  Read the article

• How to create ignore list of several items in SVN?

  - by afsharm

  Hi, I'm creating ignore list in a windows machinge using following: svn propset svn:ignore "bin" Fardis.Test directory structure is: src\ src\Fardis.Test\ src\Fardis.Test\bin\ src\Fardis.Test\obj\ I'm running that command while my currecnt dir is src. This works good but I want to add another more folder (obj) to ignore list, it fails. I tried follwings: svn propset svn:ignore "bin obj" Fardis.Test svn propset svn:ignore "bin, obj" Fardis.Test svn propset svn:ignore "bin; obj" Fardis.Test After issuing which one of them, svn status shows that none of folders bin or obj is added to ignore list. How can I solve this?

  Read the article

• Whats the difference between pulling from a branch into master and pushing that branch onto master?

  - by Justin808

  In Tortoisegit, on the repository, I right-click and select sync. At the top of the dialog there are options for Local Branch and Remote Branch. If the local branch is named DeveloperA and the remote branch is master and I do a push, what happens? If the local branch is master and remote branch is DeveloperA and I Pull, what happens? If I am on the master branch and right click, select Merge and change the From to be my DeveloperA branch, what happens? If I try to push from master to remote master and the remote is updated git stops and tells me to pull. It seems if I push from DeveloperA to master it doens't stop, it just clobbers, it that correct? We're having an issue using git where the remote master branch gets clobbered at times and we are trying to figure out why. For example there is a developer working on his DeveloperA branch. He'll pull from master to get any updates, then push to master to push out his changes. But there are times that the push lists more files in the Out Commit list than he's edited. The odd thing is he can't revert those files as git is saying they are up to date and have not been modified. Yet when he pushes git pushes the files out. The problem is if there are changes between his pull and push the changes get clobbered.

  Read the article

• Cygwin, ssh, and git on Windows Server 2008

  - by Paul

  Hi everyone. I'm trying to setup a git repository on an existing Windows 2008 (R2) server. I have successfully installed Cygwin & added git and ssh to the packages, and everything works perfectly (thanks to Mark for his article on it). I can ssh to localhost on the server, and I can do git operations locally on the server. When I try to do either from the client, however, I get the "port 22, Bad file number" error. Detailed SSH output is limited to this: OpenSSH_4.6p1, OpenSSL 0.9.8e 23 Feb 2007 debug1: Connecting to {myserver} [{myserver}] port 22. debug1: connect to address {myserver} port 22: Attempt to connect timed out without establishing a connection ssh: connect to host {myserver} port 22: Bad file number Google tells me that this means I'm being blocked, usually, by a firewall. So, double-checked the firewall settings on the server, rule is there allowing port 22 traffic. I even tried turning off the firewall briefly, no change in behavior. I can ssh just fine from that client to other servers. The hosting company swears that there's no other firewalls blocking that server on port 22 (or any other port, they claim, but I find that hard to believe). I have another trouble ticket into them, just in case the first support person was full of it, but meanwhile I wanted to see if anyone could think of anything else it can be. Thanks, Paul

  Read the article

• How to use git to manage one codebase but have different environments

  - by emostar

  I'm using git for a personal project at the moment and have run into a problem of having one codebase for two different environments and was wondering what the cleanest way to use git would be. Main Desktop I Use this machine for most of my development. I have a git repository here that I cloned off of an empty repository that I use on my internal server. I do most of my work here and push back to the internal server so I can use that as a master of truth and to ease making backups. Laptop I sometimes want to code on the road, so I did a clone from the internal server and created a new branch called "laptop-branch". Unfortunately some directories MSVC++ version are different than from the Main Desktop environment. I just modified the files in the "laptop-branch" and committed them there. Now I did a lot of changes while on vacation with my laptop, and want to push them to origin, but don't want the changes I made that were related to directories and compiler versions to be pushed back to origin. What would be the best way to get this done?

  Read the article

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