Re: [git-users] how to delete a commit?

2013-12-19 Thread Gunnar Strand
Hi, On 12/19/13 09:10, Jagadeesh N. Malakannavar wrote: Hi, May I know how to delete one intermidate commit? For ex: git one line log c4ab7b9 commit 6 a2396a2 commit 5 85020f2 commit 4 8779285 commit 3 4c0b83b commit 2 4498573 commit 1 I want to delete 8779285 commit 3 how to do that?

Re: [git-users] how to Git help me get my changes around the globe compared to SVN?

2013-12-20 Thread Gunnar Strand
Hi Oliver, You can set different repos for push and pull for US developers, so that US pull from the read-only US mirror, but pushes to the UK repo. There will be a short delay before the changes are visible in the US mirror if you use the pull strategy as described by Konstantin. git

Re: [git-users] Submodules and clobbering history

2014-01-29 Thread Gunnar Strand
On 01/29/14 00:16, Eric Reischer wrote: I have a fairly esoteric situation, but I suspect I'm probably not the only one who is attempting to do something along these lines. I have a software product that consists of a number of Git repositories, each with its own group of engineers working on

Re: [git-users] Preserving changes locally, and never commit them to anywhere

2014-02-19 Thread Gunnar Strand
Hi Oleg, There are probably other better solutions, but one way would be to add a .gitignore file listing the particular file you do not want tracked, and add the .gitignore itself file too. http://git-scm.com/docs/gitignore BR Gunnar On 02/19/14 11:35, Oleg Kosmakov wrote: Hi everyone.

Re: [git-users] Preserving changes locally, and never commit them to anywhere

2014-02-19 Thread Gunnar Strand
On 02/19/14 12:31, Gunnar Strand wrote: Hi Oleg, There are probably other better solutions, but one way would be to add a .gitignore file listing the particular file you do not want tracked, and add the .gitignore itself file too. http://git-scm.com/docs/gitignore BR Gunnar On 02/19/14

Re: [git-users] Preserving changes locally, and never commit them to anywhere

2014-02-19 Thread Gunnar Strand
On 02/19/14 12:56, Thomas Ferris Nicolaisen wrote: On Wednesday, February 19, 2014 12:31:26 PM UTC+1, Gunnar Strand wrote: Hi Oleg, There are probably other better solutions, but one way would be to add a .gitignore file listing the particular file you do not want tracked

Re: [git-users] How to setup http protocol for GIT

2014-02-25 Thread Gunnar Strand
On 02/25/14 14:16, Konstantin Khomoutov wrote: On Mon, 24 Feb 2014 12:52:05 -0800 (PST) Jirong Hu jirong...@gmail.com wrote: http://git-scm.com/book/en/Git-on-the-Server-Public-Access I was following the above link to setup http access for GIT. But after this

Re: [git-users] effect of git checkout master on master branch

2014-02-28 Thread Gunnar Strand
On 02/28/14 09:41, Daniel Hunsaker wrote: All that will happen is that any changes you've made to files git is tracking in the current commit will be reverted. New files will be left intact, as will ignored ones, but deleted files will be restored. Basically, checkout does its best to get

Re: [git-users] Merge+rebase diverged branches

2014-08-04 Thread Gunnar Strand
Hi Gergely, On 08/03/14 17:46, Gergely Polonkai wrote: Thank you for your advice, Philip! Table, in this case, is a new major feature in the app, and parts of that feature are already pushed to get feedback, that's why I have pushed commits. We are following (more or less) the GitHub flow,