Re: [git-users] Undoable reset hard
While reading your explanation I've imagined Bart Simpson writing Git is always working on the whole index over and over on the desk:) Sorry. On Sun, Mar 16, 2014 at 2:35 PM, Johannes Müller dersinndesleb...@gmx.net wrote: Hi, I can answer the question to why I ended up using reset at least, though I can imagine more scenarios. I wanted to do a reset on the current working directory (read subdirectory of the repository) instead of on the whole repository, and assumed git would do as I intuitively expected it to, without specifying the path. I should have stopped to think about this, and look up the behavior in the docs, but since I was concerned with other things I simply didn't. Actually, I still think it would be more intuitive to let git act upon the current working directory if none is specified, to prevent harm. Nonetheless, I would be happy with the proposed wrapper, but need some help to realize it. It is not that this is a need to have feature, since I normally commit most of the stuff in my working directory regularly. But it would be nice to have. Thx, Johannes On 16.03.2014 00:56, Philip Oakley wrote: To me, the --hard is a good indicator of a destructive reset. However the question should be more about why one ends up using a destructive reset when one either hasn't fully thought through the options, or perhaps should have used a softer option (and what would it be). So the rehetorical question is should it be an alternate option, and how would it work, to counter the problems of the destructive reset and trying to protect ourselves from ourselves - Is it a catch 22 problem? Perhaps there needs to be an extra git env variable (GIT_RESET_HARD_HEAD) that holds the sha1 of a faked 'commit -A' just before the 'reset --hard' is performed. This would avoid leaving lots of dummy/waste branches around. The variable name can be modelled on the various other FETCH_HEAD MERGE_HEAD and various others). So have a think about broader options... Philip -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout. -- Serge Matveenko mailto: se...@matveenko.ru github: http://lnkfy.com/1 linkedin: http://lnkfy.com/S Пародуй.рф — http://www.parodui.ru/ Специализированный магазин электронных сигарет СПб, Ленинский проспект 79 корп. 3, +7 (812) 951-25-24 -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Re: License and costs
On Wed, Mar 6, 2013 at 4:26 PM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: 1) Is there any license costs for using GIT at enterprise level No, there are no costs associated with license. Git is free software under the GPLv2 license But it always good to donate to the project you successfully used a lot. Let git be one of such a tool for you. -- Serge Matveenko mailto: se...@matveenko.ru github: http://lnkfy.com/1 linkedin: http://lnkfy.com/S -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] how to create a new empty branch
On Fri, Mar 1, 2013 at 1:24 PM, lei yang yanglei.f...@gmail.com wrote: how to create a new empty branch, any command? from http://www.kernel.org/pub//software/scm/git/docs/git-checkout.html : git checkout --orphan new_branch Create a new orphan branch, named new_branch, started from start_point and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits. The index and the working tree are adjusted as if you had previously run git checkout start_point. This allows you to start a new history that records a set of paths similar to start_point by easily running git commit -a to make the root commit. This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish an open source branch of a project whose current tree is clean, but whose full history contains proprietary or otherwise encumbered bits of code. If you want to start a disconnected history that records a set of paths that is totally different from the one of start_point, then you should clear the index and the working tree right after creating the orphan branch by running git rm -rf . from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc. -- Serge Matveenko mailto: se...@matveenko.ru github: http://lnkfy.com/1 linkedin: http://lnkfy.com/S -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] e-git
On Fri, Jan 25, 2013 at 6:44 AM, adri...@localhost8080.com.br wrote: How can I make a merge in eclipse e-git? The link Mark as merged doesn't works.. Nothing changes when I clicked this link... Here is a little tutorial that might be helpful for you to use egit for merging: http://wiki.eclipse.org/EGit/User_Guide#Possible_merge_results -- Serge Matveenko mailto: se...@matveenko.ru github: http://lnkfy.com/1 linkedin: http://lnkfy.com/S
Re: [git-users] Re: [Ubuntu 12.04 LTS] [git version 1.7.9.5] how to update to 1.8.1.1?
On Mon, Jan 21, 2013 at 11:21 PM, Jesús García Crespo je...@sevein.com wrote: Peter van der Does is maintaining a PPA that worked great for me. https://launchpad.net/~pdoes/+archive/ppa There is ppa supported by git-core team also. https://launchpad.net/~git-core/+archive/ppa for stable (1.8.0.3 for now) and https://launchpad.net/~git-core/+archive/candidate for rc (1.8.1 already) -- Serge Matveenko mailto: se...@matveenko.ru github: http://lnkfy.com/1 linkedin: http://lnkfy.com/S --
Re: [git-users] Re: securing data in a non-local repository
On Wed, Dec 12, 2012 at 5:27 PM, John McKown john.archie.mck...@gmail.com wrote: Thanks. I had forgotten that encrypting data tends to randomize it and so it wouldn't compress very well. What I was thinking was of was GitHub's private repositories perhaps containing company proprietary software. It might be attractive to a startup which recruits non-local talent and does its work via the Internet rather than in an office building. In that case, my paranoia would kick in about the possibility of GitHub being hacked and my source stolen or compromised. I guess in this case, it would be wise for the startup to run a GitHub Enterprise virtual server on its own equipment. Or, like I do, have a git subdirectory on a machine which contains the various repositories and is accessible only via SSH. I.e. keep it in house with external developers having an SSH connection to the git server. You may be interested in using gitolite https://github.com/sitaramc/gitolite to host your repositories in house. The setup is easy and you will get many features that github has. -- Serge Matveenko mailto: se...@matveenko.ru github: http://lnkfy.com/1 linkedin: http://lnkfy.com/S --
Re: [git-users] Include empty folders
On Sat, Sep 8, 2012 at 7:38 PM, Mindcast Mindcast i...@mindcast.gr wrote: is there any way to include empty folders when i git commit without adding a file (like .gitignore or .gitkeep) ? As long as i know there is no official way to do this. But, is this something it can be implemented maybe in a future version ? You may put .gitignore in such a directory containing: * !.gitignore It will add .gitignore and will never add anything under this dir. -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] dropbox git
On Mon, Jul 30, 2012 at 2:30 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: 1. It also assumes the filesystem implements working locking (in the sense locking actually works, not just appropriate syscalls complete successfully). But this is only an issue when there are several people accessing the repo in parallel, so this requirements probably does not apply to your case. This is an issue when you are trying to access bare repo that is not already synced from the other machine to local one. That may and probably will destroy repository consistency. The only solution that will allow one to use git repo (local or bare as remote) is to use one block device file inside Dropbox folder and mount it when needed and then unmount it to allow Dropbox sync it as one and only one binary file. This case could be easy replaced by zipped bare repository that will also work as expected. Thus the only safe that is easy enough is to never use Dropbox to store git repositories. Use github, your own hosted repo (e.g. use gitolite to admin it), or just use bare repo stored somewhere on remotely accessed machine via regular ssh. -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] dropbox git
On Mon, Jul 30, 2012 at 9:02 PM, Owen Densmore o...@backspaces.net wrote: (Just to be clear in case I've used the wrong terminology: My src/ folder is in my Dropbox folder thus shared across all my systems. I wish to use github as my remote repository. Being noob, I hope this has been clear! So...) OK, looks like src/ in Dropbox, used with Git/GitHub is a bad idea. Sigh. Or. I think it is ok to symlink your src folder into Dropbox and to keep .git folder out of Dropbox. This will allow you to have your current checkouted working copy on all machines up to date but also will not harm your repo data. In this case you need to keep an eye on where the HEAD is pointing (what is the current last commit known to local git repo) across all machines you will sync your repo. I recommend the following files layout to achieve described scenario: project_name/ - src/ - .git/ Dropbox/ - project_name/ # symlink to project_name/src Not very clear solution as you need to keep track of the repo in several places. But it will not harm your .git folder and will do the trick. In real life you probably need to follow this scenario if you do not want to push not finished code to the main repo. But as Linus could say, then you are using git in wrong way. You could easily do the same if you make temporary branch (say it named tmp) from all of the not already commited changes and push this branch to the main repo. Than you will be able to do on the second machine to continue your suspended work: 1. git fetch 2. git merge --squash --no-commit origin/tmp 3. git reset 4. git push origin :tmp After this you will have exactly the same repository and working copy state as on your first machine where you've suspended the work and will not have tmp branch in main repo. It is good practice to include your username in the name of such temporary branch, e.g. owen-tmp, if you are not the only person who uses that repo. But it completely depends on the your branch naming convention. -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] New user gets lost driving the Git Bash
On Tue, Jul 24, 2012 at 3:18 AM, Łukasz Siwiński lsiwin...@gmail.com wrote: Ps: after: $ echo dir alias='ls' .bashrc exit relaunch your prompt (bach/command line) alias dir='ls -Alh' gives more familiar look for windows user personally I use this alias in my linux shell for over 6 years -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: git checkout . overwrites all my changes
On Thu, Jul 12, 2012 at 6:32 PM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: In essence, checkout is the equivalent of what some other systems call revert, and you have to get used to treating it with respect (as with any git command). IMHO, it looks more like switch usually. -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] HEAD is not pointing to a branch
On Wed, Jun 27, 2012 at 12:30 PM, mike mikaelpetter...@hotmail.com wrote: So from Eclipse I checkout the master called origin/master. Then I select Team -- 'Merge' and I get the following message: HEAD is not pointing to a branch You do not have any local branch pointing to checked out commit now really. You've just checked out a commit as your HEAD that is the head of the origin/master branch. But you need to checkout a new branch master that will be a copy (local fork) of the origin/master or more probably you need to checkout your existing master and merge origin/master into it. -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Question about commit size
On Wed, Jun 20, 2012 at 11:43 AM, paymaster baekseon...@gmail.com wrote: How can I know commit size? What is size? A number of lines affected? Raw patch size in bytes? Compressed patch size in bytes? Mount of data transferred via push maybe? -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Using Git in a web development environment (specifically with Coda 2 and a web server)
On Mon, May 28, 2012 at 3:57 AM, Heronymo Allen heron...@gmail.com wrote: Locally, I've got my dev folder. On the server, I set up a git repository in the folder that contains test.domain.com, as well as another repository in the folder that contains the domain.com files. This means I'll have 3 repos. I can push commits to the test repo, then when I'm happy with it, I can push them to the live site? Since Coda allows just one server to be defined (I do hope they change that...) then perhaps I should connect it to the test domain, and then use the GitHub app to push the files to the main domain when they're good to go? I figure the files always come from my local, and they don't travel from the test domain to the live domain when ready. As git is distributed scm you can use your described setup. But personally I prefer to have central bare repository. You could use github for this ot any other hosted solution or your personal git server. There I setup permissions for users (other repository clones). E.g. developer (you) can read and write to repository. Test user (test.domain.com) has read only access. Production user (domain.com) has read only access (and restricted to access release-* branches only sometimes on paranoid configurations). Having such setup you are able to checkout any branch on your test domain and on the production when you need. Also you are know exactly what branch you are testing or deploying. You can switch to test or production branch on your development repository at any time and fix it if you need. And your development branch(es) will not be touched by those modifications. Here is blog post I've just found about one simple git usage workflow http://thinkvitamin.com/code/source-control/git/our-simple-git-workflow/ There are infinite number of the possible git workflow schemes you are free to implement. -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] git pull asks for commit comment
On Tue, May 22, 2012 at 12:22 PM, Thorsten Peters impyna...@googlemail.com wrote: After update git to latest version, git pull asks for a commit comment if a merge is needed. Is there an option to auto commit with default comment at git pull? You may use git pull --no-edit or set GIT_MERGE_AUTOEDIT environment variable to no. Consult http://git-scm.com/docs/git-pull and http://git-scm.com/docs/git-merge P.S.: It is better to do write some messages on merging though. -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] A real go back plan
On Tue, Apr 17, 2012 at 21:59, Patrick pn1.d...@gmail.com wrote: I do want to know when the merge conflict exists so I can check it but, is there a way to drop the pull that local system B did and pull the central repo version after I decide review it? 1. git reset --hard # this to reset your local reviewing into local history state 2. git reset --hard origin/branch_name # this to reset your local checkouted branch to the central repo state Repeat step 2 for every branch you want to reset into central repo state after checkouting each corresponding local branch -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Handling binary files?
On Wed, Apr 4, 2012 at 17:30, Eric Parent parent.eri...@gmail.com wrote: I've created a .gitattributes with *.sdf -binary in my project's http://progit.org/book/ch7-2.html *.sdf -crlf -diff or *.sdf binary not *.sdf -binary because you are telling git to not treat this files as binary with this line. look on to the minus sign. -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] SVN vs GIT
On Thu, Mar 8, 2012 at 06:02, Andrew Gray andrew.paul.g...@gmail.com wrote: The pushback I am getting is: 1. What does GIT give me that I don't get with SVN 2. It is just another thing I have to learn and why should I when I don't know what benefit I get. It is very common mistake to try to convince regular developers to move to git. Such tactic will not succeed usually. Git does not have any benefits for the developer who just do svn co, svn up. Git's benefits are in the Team Lead and Release Engineer scopes. You just need to convince key persons to move to git. Other will thank you later when central repo will crash or you will guide somebody over series of git blame, git bisect, git rebase or git filter-branch. By the way there is very useful video for getting people know benefits of git better. http://www.youtube.com/watch?v=4XpnKHJAok8 Tech Talk: Linus Torvalds on git -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
