Re: [git-users] Git as a photo backup tool

2017-02-02 Thread Konstantin Khomoutov
On Wed, 25 Jan 2017 13:09:39 -0800 (PST) Carsten wrote: > My goal is to obtain a very simple backup system for typical JPEG > photos. Each photo is a few MB in size and there are several > thousands of them. [...] I'd say it doesn't worth it. I would just use borg

Re: [git-users] where is the .git file?

2017-01-31 Thread Konstantin Khomoutov
On Tue, 31 Jan 2017 15:18:44 -0800 (PST) Ben David wrote: > I will absolutely run away with this - all of your answers suck, [...] > I understand you all are attempting to help, No, you don't -- see below. > and appreciate the attempt even if I'm a bit belligerent

Re: [git-users] More on that "merge branch checkout" problem -- cannot abort/go back?

2017-01-29 Thread Konstantin Khomoutov
On Sun, 29 Jan 2017 11:07:34 -0800 Michael wrote: > So since my attempt to switch branches with the "merge" flag (-m) > gave me an error, I thought I'd try to go back. > > keybounceMBP:Finite-Fluids michael$ git merge --abort > fatal: There is no merge to abort (MERGE_HEAD

Re: [git-users] Re: git bundle - Branches are missing after clone

2017-01-18 Thread Konstantin Khomoutov
On Wed, 18 Jan 2017 02:26:16 -0800 (PST) Ralf Tobel wrote: [...] > Now I tried your suggestion below instead of 'git clone > path/to/git/bundle' to create the clone: > git init target > cd target > git fetch -u path/to/git/bundle 'refs/*:refs/*' > git reset

Re: [git-users] Re: git bundle - Branches are missing after clone

2017-01-18 Thread Konstantin Khomoutov
On Wed, 18 Jan 2017 00:55:55 -0800 (PST) Ralf Tobel wrote: > After cloning the bundle I just want to be able to checkout a branch > which is shown in list-heads. > > E.g. I see the following line in list-heads: > f63be4c756bf7a6a4cc1db2e08a587a4d3f796c5 >

Re: [git-users] Re: git bundle - Branches are missing after clone

2017-01-17 Thread Konstantin Khomoutov
On Tue, 17 Jan 2017 05:56:46 -0800 (PST) Ralf Tobel wrote: > You're suggestion works perfectly fine. No question. > > For my case I now bundle the original repository which works also > fine and solves my problem too. > > I just wondered how I could get access to these

Re: [git-users] Re: git bundle - Branches are missing after clone

2017-01-17 Thread Konstantin Khomoutov
On Tue, 17 Jan 2017 05:23:29 -0800 (PST) Ralf Tobel wrote: > Your response was helpful in a sense that I understand what clone > does. > > But still I can not see how I get all the refs which are in the > bundle back in my repository. > It doesn't help that I can backup

Re: [git-users] git bundle - Branches are missing after clone

2017-01-17 Thread Konstantin Khomoutov
On Mon, 16 Jan 2017 06:15:52 -0800 (PST) Ralf Tobel wrote: > Actually I planned to use the bundle as a nice way of creating a > backup in a single file. > And since I see the branches in the bundle when I use the 'git bundle > list_heads' command I thought there might be a

Re: [git-users] git bundle - Branches are missing after clone

2017-01-16 Thread Konstantin Khomoutov
On Mon, 16 Jan 2017 05:27:41 -0800 (PST) Ralf Tobel wrote: > I have a strange problem when working with bundles. > > I first create a bundle from a repository with tags and branches > using the following command: > git -C bundle create Test.bundle --all > > When I

Re: [git-users] Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

2017-01-11 Thread Konstantin Khomoutov
On Wed, 11 Jan 2017 16:35:33 -0800 (PST) AD S wrote: > Sorry I really don't mean for this to sound pessimistic or whiny - it > really is a genuine question. > > I come from a background of solo work where I didn't really use git > all that much. Now I work with a very

Re: [git-users] Bash Script For Git Clone

2017-01-09 Thread Konstantin Khomoutov
On Mon, 9 Jan 2017 01:42:34 -0800 (PST) KANNU CHAWLA wrote: > I am trying to automate the process of git cloning by writing a bash > script. Any ideas, suggestions are welcome. #!/bin/sh git clone $REPOSITORY -- You received this message because you are

Re: [git-users] What is the difference between * and \*

2017-01-08 Thread Konstantin Khomoutov
On Mon, 9 Jan 2017 09:26:15 +0300 Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: > On Sun, 8 Jan 2017 09:54:30 -0800 > Michael <keybou...@gmail.com> wrote: > > > So, the question of "which form to use on windows" depends if you > > are us

Re: [git-users] What is the difference between * and \*

2017-01-08 Thread Konstantin Khomoutov
On Mon, 9 Jan 2017 09:26:15 +0300 Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: > On Sun, 8 Jan 2017 09:54:30 -0800 > Michael <keybou...@gmail.com> wrote: > > > So, the question of "which form to use on windows" depends if you > > are us

Re: [git-users] What is the difference between * and \*

2017-01-08 Thread Konstantin Khomoutov
On Sun, 8 Jan 2017 09:54:30 -0800 Michael wrote: > So, the question of "which form to use on windows" depends if you are > using git for windows with the normal windows shell, or if you are > using git for windows with cygwin and the bash shell? Sounds about correct.

Re: [git-users] What is the difference between * and \*

2017-01-08 Thread Konstantin Khomoutov
On Sun, 8 Jan 2017 07:42:45 -0800 (PST) Fernando Rodriguez wrote: > I've seen the command > > git rm log/\*.log > > at [1] , my questions is what is the difference by just doing > > git rm log/*.log > > I'm using a windows version for git and I don't see any

Re: [git-users] mirror repository from server hook

2016-12-19 Thread Konstantin Khomoutov
On Sat, 17 Dec 2016 16:27:25 -0800 (PST) tombert wrote: > Inside the server pre-receive hook I configure a new remote and push > to it. Similar to this: > > *git remote add test http://something.something/repo* > *git push --mirror test* > > From the bash command line

Re: [git-users] fetched to wrong branch

2016-12-19 Thread Konstantin Khomoutov
On Mon, 19 Dec 2016 17:43:18 +0100 Pablo Rodríguez wrote: > I have a local repository and a remote at GitHub. My local repo had a > master branch and the remote had only a gh-pages branch. > > I wanted to pull from my gh-pages remote branch (with "git pull origin > gh-pages"). I

Re: [git-users] No available terminals

2016-12-19 Thread Konstantin Khomoutov
On Thu, 15 Dec 2016 03:16:51 -0800 (PST) Dexx Mandele wrote: > I generally run several git bash instances at a time to keep track of > several interlinked packages. Once in a while I suddenly get this > error when I try to open a new git bash terminal. > > Error: could not

Re: [git-users] Git push overwrote remote's files instead of merging. What could have caused this?

2016-12-19 Thread Konstantin Khomoutov
On Sun, 18 Dec 2016 23:12:36 -0800 (PST) AD S wrote: > I pushed some files to my remote server, same as I have always done > for this project. I was expecting to have merge conflicts which I > would fix but I got none. I checked the remote server and saw that my > adjusted

Re: [git-users] How to create remote GIT repository?

2016-12-13 Thread Konstantin Khomoutov
On Tue, 13 Dec 2016 21:44:15 -0800 (PST) essam Ganadily wrote: > As far as i can tell, there is no way i can create remote git > repository from command line (git.exe in windows). if i am not > mistaken shall you tell me why such limitation exist given that git > is an old

Re: [git-users] Community Email for sending bugs

2016-12-08 Thread Konstantin Khomoutov
On Thu, 8 Dec 2016 22:04:33 -0800 (PST) Karamjeet Singh wrote: > I want to send bug to git support, but that is not working. I am > getting the bounce from the email i.e. shared on this url > https://git-scm.com/community. Is there any way i can send the bugs > to

Re: [git-users] Re: Need sine help on Git hooks

2016-12-07 Thread Konstantin Khomoutov
On Wed, 7 Dec 2016 17:34:27 +0530 Mrudula Varimadugu wrote: > Still not working. > I tried by keeping die("Kaboom!\n"); in the pre-receive file. > but still it pushed my commit, it didn't fail. > see the output below when I tried individually ./pre-receive it >

Re: [git-users] Re: Need sine help on Git hooks

2016-12-07 Thread Konstantin Khomoutov
On Wed, 7 Dec 2016 02:58:22 -0800 (PST) mrudula.varimad...@gmail.com wrote: > I tried the below, > when I am individually running ./pre-receive its working, but when I > try to push even If am not giving jirs issue its pushing to remote. > Please help me on this Good to know you actually tried

Re: [git-users] Re: Need sine help on Git hooks

2016-12-07 Thread Konstantin Khomoutov
Thursday, September 5, 2013 at 3:32:27 PM UTC+5:30, Konstantin > Khomoutov wrote: > > > > On Wed, 4 Sep 2013 11:39:21 -0700 (PDT) > > Ling <oylf...@gmail.com > wrote: > > > > > Thanks Konstantin, Yes I tried git log $newname $(git mer

Re: [git-users] merge orginal with fork

2016-12-07 Thread Konstantin Khomoutov
On Wed, 7 Dec 2016 00:51:32 -0800 (PST) Charlie Oehlrich wrote: > e-f-g > > e-f-l-m > > the one question is kind of hard to answer since in github desktop it > says E-F-G and on the website it says E-F-L-M. OK, so it turns out a local Git client tells you your

Re: [git-users] merge orginal with fork

2016-12-06 Thread Konstantin Khomoutov
On Tue, 6 Dec 2016 18:55:28 -0800 (PST) Charlie Oehlrich wrote: > it is currently like this > > master = A-B-C-D > > branch-2 = E-F-G > > branch-3 = H-I-J-K > > G is both of these commits in the original > repositry: >

Re: [git-users] Porting changes through Git

2016-11-29 Thread Konstantin Khomoutov
On Tue, 29 Nov 2016 00:38:28 -0800 (PST) Madhumita Bharde wrote: > > > A project I started working on involves changes to opensource git > > > repos -* repo1 *and *repo2* > > > So we have a private git repo say, *myrepo* created with older > > > versions of both

Re: [git-users] Porting changes through Git

2016-11-29 Thread Konstantin Khomoutov
On Mon, 28 Nov 2016 23:03:38 -0800 (PST) Madhumita Bharde wrote: > A project I started working on involves changes to opensource git > repos -* repo1 *and *repo2* > So we have a private git repo say, *myrepo* created with older > versions of both repo1 and repo2

Re: [git-users] Help to understand git merge conflicts

2016-11-24 Thread Konstantin Khomoutov
On Wed, 23 Nov 2016 11:43:13 -0800 (PST) Daniel PRESA wrote: > So here is the thing, i just don't get the git merge conflict and how > to resolve them, > especially when i already tried to resolve the conflict and finished > to have half my changes merged, the other

Re: [git-users] GIT API Provider?

2016-11-22 Thread Konstantin Khomoutov
On Tue, 22 Nov 2016 09:00:16 -0800 Michael wrote: > >> Hello GIT experts, > > > > git is not an acronym, no need to capitalize :) > > Grand Information Theory? > Glorious Information Technology? > Global Intellectual Thinking? > Ground Into Trouble? > > (Someone can do

Re: [git-users] Re: merge commits in one branch

2016-11-21 Thread Konstantin Khomoutov
On Mon, 21 Nov 2016 11:05:31 -0800 (PST) Charlie Oehlrich wrote: > when i forced pushed it to github it said the commit was by > invalid-email-address so is there a way to change that? No idea. But supposedly you need to get correct settings for your "user.name"

Re: [git-users] merge commits in one branch

2016-11-21 Thread Konstantin Khomoutov
On Sun, 20 Nov 2016 18:59:48 -0800 (PST) Charlie Oehlrich wrote: > it is actually like this > > branch-1 is the 1st line > > branch-2 is the 2nd line > > master is the 3rd line > > A--B--C--D > > E--F--G--H--I > > J--K---L--M > > and i want it to do this >

Re: [git-users] pull merge fetch rebase confusion

2016-11-18 Thread Konstantin Khomoutov
On Thu, 17 Nov 2016 15:25:09 -0500 Walt Feasel wrote: [...] > > > > Considering this, what do you call "staging-testing" -- a > > > > repository or a branch in the cloned repository? > > > > > > > I am thinking 'staging-testing' is a local copy of the remote > > >

Re: [git-users] pull merge fetch rebase confusion

2016-11-17 Thread Konstantin Khomoutov
On Thu, 17 Nov 2016 13:56:06 -0500 Walt Feasel <waltfea...@gmail.com> wrote: > On Thu, Nov 17, 2016 at 09:11:48PM +0300, Konstantin Khomoutov wrote: > > On Thu, 17 Nov 2016 11:25:17 -0500 > > Fleetwood Farm <waltfea...@gmail.com> wrote: > > > > [...] >

Re: [git-users] pull merge fetch rebase confusion

2016-11-17 Thread Konstantin Khomoutov
On Thu, 17 Nov 2016 11:25:17 -0500 Fleetwood Farm wrote: [...] > I believe I am understanding it better already. I will need to reread > it a few more times, and your provided links, to digest it all, but > think I can see land through the fog now. I am never going to push

Re: [git-users] git merge

2016-11-17 Thread Konstantin Khomoutov
On Thu, 17 Nov 2016 02:19:30 -0800 (PST) ran...@cnetric.com wrote: > hi everyone, i want to pull code from the REPO to LOCAL and always > edit changes before merge but when i pull updates it immediately > merges them.. what is the correct command too use so that i can edit > changes every time

Re: [git-users] pull merge fetch rebase confusion

2016-11-17 Thread Konstantin Khomoutov
On Wed, 16 Nov 2016 14:18:10 -0800 (PST) Walt Feasel wrote: > I am having a really tough time determining which procedure I should > use to update my branches. I see conflicting advise on which is > better for situations cause of the log changes made. > > I think if I

Re: [git-users] When is it reasonable to advise developers NOT to fork the main repo to create feature branches from?

2016-11-07 Thread Konstantin Khomoutov
On Mon, 7 Nov 2016 08:16:26 -0800 (PST) David Karr wrote: > I'm working with a team that is new to git. I'm not "new" to git, > but I wouldn't describe myself as an expert. However, I've used > almost every popular SCM tool that came before, since there were SCM >

Re: [git-users] Yet more git madness

2016-11-01 Thread Konstantin Khomoutov
On Mon, 31 Oct 2016 18:42:14 -0700 (PDT) AD S wrote: > Man, I HATE git. [...] > Seriously, since using git about 60% of my time is spent fixing git > problems instead of doing my job. So sick of this! Please consider just f*cking reading any f*cking book on Git, mate,

Re: [git-users] Maintaining a history of a patchset?

2016-10-24 Thread Konstantin Khomoutov
On Fri, 21 Oct 2016 20:47:56 -0700 Michael wrote: > Lets say you have a system where you have an unmodified upstream > source, and a set of patches to get that upstream source to run on > your system. The git-series tool was announced recently [1], and the discussion ensued

Re: [git-users] git checkout crashes after server being updated to Debian X86_64

2016-10-18 Thread Konstantin Khomoutov
On Tue, 18 Oct 2016 07:56:31 -0700 (PDT) Raffael Reichelt wrote: > I have a serious problem with git, After my provider had updated to a > X86_64 architecture git crashes with various memory-related errors. > This is happening remote when pushing to the repository

Re: [git-users] Using git in an unusual way, need advice

2016-10-18 Thread Konstantin Khomoutov
On Tue, 18 Oct 2016 07:08:00 -0400 rhkra...@gmail.com wrote: > I sent this and the next email to another list and didn't get any > response-- I've partially resolved my issue (see next post), and I'm > also beginning to understand that branches might also solve my issue > (but patches see more

Re: [git-users] Using git in an unusual way, need advice

2016-10-17 Thread Konstantin Khomoutov
On Sun, 16 Oct 2016 21:39:41 -0400 rhkra...@gmail.com wrote: > I am probably using git in an unusual way. > > I want to do some development for a project that is managed by > Mercurial (scite / scintilla), but, for the sake of learning git (and > minimizing the need to learn anything else) I

Re: [git-users] Re: File timestamp changed after reverting back to an original commit

2016-10-05 Thread Konstantin Khomoutov
On Wed, 5 Oct 2016 05:42:27 -0700 (PDT) Croqueur Fou wrote: > Thanks Philip > Thanks Konstantin, > > I tried the utility setting the modified date of the file to the > checkout time. It works but can't help in my case. > > I understand that there is no way to

Re: [git-users] File timestamp changed after reverting back to an original commit

2016-09-29 Thread Konstantin Khomoutov
On Thu, 29 Sep 2016 06:32:32 -0700 (PDT) Croqueur Fou wrote: > When checking-out back to an original branch or commit, the > time-stamps of the changed files is reset to the current timedate, > not to their original time-stamps. Is there an option in git to >

Re: [git-users] Bash shell script to create GitHub repos from a Mac

2016-09-27 Thread Konstantin Khomoutov
On Tue, 27 Sep 2016 06:56:06 -0700 (PDT) Wilson Mar wrote: > I'd like your opinion of a shell script I created at: > https://github.com/wilsonmar/git-utilities/blob/master/git-sample-repo-create.sh > > I created it as part of my Master class on Git and GitHub > to provide a

Re: [git-users] Deleting code now but want to retrieve it easily at a later date

2016-09-27 Thread Konstantin Khomoutov
On Tue, 27 Sep 2016 15:29:07 +0300 Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: > > I have a client that wishes to have some functionality removed from > > a website that I'm building but I'm not totally convinced they won't > > want the functionalit

Re: [git-users] Deleting code now but want to retrieve it easily at a later date

2016-09-27 Thread Konstantin Khomoutov
On Tue, 27 Sep 2016 05:12:35 -0700 (PDT) Neil Nand wrote: > I have a client that wishes to have some functionality removed from a > website that I'm building but I'm not totally convinced they won't > want the functionality added back to the site at a later date. > > Is

Re: [git-users] Does git have a way for workflow tools to identify a custom state?

2016-09-20 Thread Konstantin Khomoutov
On Tue, 20 Sep 2016 10:14:30 -0700 (PDT) Darragh Bailey wrote: > I've been working on a workflow tool to help with automating syncing > with upstream open source projects (mainly openstack), where it > allows for the patch queue to be automatically pruned of anything >

Re: [git-users] Feature request: Batch edit commit messages

2016-09-15 Thread Konstantin Khomoutov
On Thu, 15 Sep 2016 02:18:17 -0700 (PDT) Maaartinus wrote: > There's no really good solution for batch editing commit messages. > You can use interactive rebase, filter branch, or format patch, but > you never get a nice complete list of messages to edit. Maybe this > idea

Re: [git-users] Help needed with rebase

2016-09-14 Thread Konstantin Khomoutov
On Wed, 14 Sep 2016 10:33:24 -0700 Michael wrote: > So I really don't understand the command line for rebase. > > What I have: My last two commits on master should have either been on > develop, or on a branch off develop. So, that's the case for cherry pick, not rebasing:

Re: [git-users] Re: non-committed change in a test branch is polluting my master branch

2016-09-14 Thread Konstantin Khomoutov
On Tue, 13 Sep 2016 11:28:23 -0700 Michael wrote: > > Thank you Konstantin and Gergely! > > Very informative reading. I'll try to keep my tree sorted out in > > the future. :-) > Having gone through the same issue myself multiple times before > figuring out what was going

Re: [git-users] non-committed change in a test branch is polluting my master branch

2016-09-13 Thread Konstantin Khomoutov
On Tue, 13 Sep 2016 07:26:02 -0700 (PDT) Pierre Dutronc wrote: [...] > I found it very useful to be able to create a new test branch, alter a > few lines of code and see how it worked out. If it worked well, I > would switch back to master and merge the test branch into

Re: [git-users] Could GIT help with this task?

2016-09-08 Thread Konstantin Khomoutov
On Wed, 7 Sep 2016 15:28:58 -0700 (PDT) edgaroliveira@gmail.com wrote: > I thought the git is good for all types project. Because the Linux > distribution using this Version Control System. Some nitpicking first, sorry: "Linux" is the name of a project implementing an operating system's

Re: [git-users] Why the directory, through git clone, has less files of the older directory through git pull origin master?

2016-09-08 Thread Konstantin Khomoutov
On Fri, 2 Sep 2016 15:53:45 -0700 (PDT) edgaroliveira@gmail.com wrote: > So, this means which I can stay rested because this is normal! :) > This means if I delete my directory on pc1 or pc2 I won't lost any > files. Because this difference on numbers of file it is refers > archive which git

Re: [git-users] Copy file preserving hostory

2016-09-06 Thread Konstantin Khomoutov
On Mon, 5 Sep 2016 23:53:49 -0700 (PDT) hellboy wrote: > I am looking for the simplest way to copy file from one git repo to > another one on Windows platform (may be with Mingw) or in Webstorm. No, there's no direct way to do that. This mostly stems from the fact Git

Re: [git-users] Push to my repository at the github and my owner private repository

2016-09-05 Thread Konstantin Khomoutov
On Mon, 5 Sep 2016 05:16:39 -0700 (PDT) edgaroliveira@gmail.com wrote: > I have a repository in github and I also need have this repository in > my owner private repository, at home. > I would like do "git push origin master", once time to github and > another time to my owner private

Re: [git-users] git new bird: Server aborted the SSL handshake

2016-09-01 Thread Konstantin Khomoutov
On Wed, 31 Aug 2016 18:03:47 -0700 (PDT) chenhyde...@gmail.com wrote: > my try is here: > $ export GIT_CURL_VERBOSE=1 > > $ git clone https://github.com/schacon/simplegit-progit > > Cloning into 'simplegit-progit'... > > * Couldn't find host github.com in the .netrc file; using defaults > >

Re: [git-users] git new bird: Server aborted the SSL handshake

2016-08-31 Thread Konstantin Khomoutov
On Tue, 30 Aug 2016 18:38:45 -0700 (PDT) chenhyde...@gmail.com wrote: [...] > Here I do practice with the command "git log". (MAC, OSXEI capitan > 10.11.6) > > chenhaide$ git clone https://github.com/schacon/simplegit-progit [...] > Server aborted the SSL handshake [...] What happens if you run

Re: [git-users] can someone explain this error which happens during git push

2016-08-24 Thread Konstantin Khomoutov
On Tue, 23 Aug 2016 16:54:58 -0700 (PDT) alexisdroid...@gmail.com wrote: This tells you the reason literally: > hint: Updates were rejected because the remote contains work that you > do not have locally. This is usually caused by another > repository pushing to the same ref. You may want to

Re: [git-users] git merge -- resolving conflicts?

2016-08-16 Thread Konstantin Khomoutov
On Mon, 15 Aug 2016 12:16:46 -0700 Michael wrote: [...] > >> Also: Why "ours" and "theirs"? Which one is which? I'm one person > >> with multiple branches. > > > > Well, sure it's a bit philosophical because there are different > > ways to _look_ at what a merge is. To

Re: [git-users] git merge -- resolving conflicts?

2016-08-15 Thread Konstantin Khomoutov
On Sat, 13 Aug 2016 18:15:17 -0700 Michael_google gmail_Gersten wrote: [...] > > > After I've done the "git merge" and it has failed, how can I then > > > auto-select on a file by file basis? > > > > I think you want > > > > $ git checkout --ours . > > $ git add -u > >

Re: [git-users] moving files to names that were part of the repository

2016-08-12 Thread Konstantin Khomoutov
On Fri, 12 Aug 2016 18:59:37 +0200 Xen wrote: > > What `git mv` did is removed -- from the commit you have recorded > > after running that command -- the file as it was known under its > > old name and added the same contents under its new name. > > Sometimes Git will

Re: [git-users] moving files to names that were part of the repository

2016-08-12 Thread Konstantin Khomoutov
On Fri, 12 Aug 2016 17:42:20 +0200 Pablo Rodríguez wrote: > I’m writing a book with git as control version system. > > I have been writing over 300 pages in a file named `my-book.tex`. Now > I realize that I should start it from scratch. So I just `git mv > my-book.tex

Re: [git-users] changing email in one repo

2016-08-12 Thread Konstantin Khomoutov
On Fri, 12 Aug 2016 17:50:12 +0200 Pablo Rodríguez wrote: > I have a repo (also hosted at Gitlab) that uses an email address that > I would like to remove from the whole repo (and replace with another > one). > > All contributions to that repo are mine. Is there any way that I can

Re: [git-users] SHA-1 checksum

2016-08-09 Thread Konstantin Khomoutov
On Mon, 8 Aug 2016 20:21:47 -0700 (PDT) Sharan Basappa wrote: > > Well, there are exactly three types of objects in Git repos: blobs, > > trees and commits. Files are stored as blobs. Blobs have no "file > > names" attached to them; in fact, they keep no associated

Re: [git-users] Stacked git?

2016-08-09 Thread Konstantin Khomoutov
On Tue, 9 Aug 2016 10:23:00 -0700 Michael wrote: [...] > So, it's basically a set of local changes from the official source > distribution? And tools for managing that? If we tell about one (supposedly the most common) application of patch series then yes. > I am thinking

Re: [git-users] Stacked git?

2016-08-09 Thread Konstantin Khomoutov
On Mon, 8 Aug 2016 21:27:43 -0700 Michael wrote: > Can someone explain stacked git? > > It was referenced in "Git from the bottom up", but I've never used > Quilt, and neither project really explains what it is for/doing. Well, there's certain kind of changes -- relative

Re: [git-users] SHA-1 checksum

2016-08-08 Thread Konstantin Khomoutov
On Mon, 8 Aug 2016 09:00:06 -0700 (PDT) Sharan Basappa wrote: [...] > > The contents of file "-NOTES" is in > > .git/objects/02/15040f90f133f999bac86eede7565c6d09b93d. In this > > case, that object is in one of the "pack" files. git-cat-file has > > to read through

Re: [git-users] SHA-1 checksum

2016-08-08 Thread Konstantin Khomoutov
On Sun, 7 Aug 2016 09:26:30 -0700 (PDT) Sharan Basappa wrote: > I would like to know why GIT calculates checksum of a file. > Typically, checksum is used for the purpose of integrity. Well, Git does this for two reasons: 1) It's what makes "D" in the "DVCS"

Re: [git-users] Overriding the "git merge" command

2016-08-04 Thread Konstantin Khomoutov
On Thu, 4 Aug 2016 08:33:57 -0700 (PDT) Guilherme Cavalcanti wrote: > I am a PhD candidate researching about merge tools and doing > experiments with git and github. > I know that when the *git merge* command fails in presence of > conflicts, it is possible to invoke

Re: [git-users] lost file with git add - git rm -f

2016-08-02 Thread Konstantin Khomoutov
On Mon, 1 Aug 2016 13:44:55 +0200 (CEST) Xen wrote: [...] > > git wiped the file from disk. I worked very hard on that file > > (several days( and I really hope this can be recovered. I could not > > find a solution on the web. [...] > I hope the advice that was given to you

Re: [git-users] lost file with git add - git rm -f

2016-07-30 Thread Konstantin Khomoutov
On Fri, 29 Jul 2016 16:09:36 -0700 (PDT) GUGLHUPF wrote: > Hi, > fairly new to git. Today I did a "git add somefile" and then decided > I wanted to unstage it. I did then a "git rm -f somefile". There was > no git command in between. Particularly no commit. > > git

Re: [git-users] lost file with git add - git rm -f

2016-07-30 Thread Konstantin Khomoutov
On Fri, 29 Jul 2016 16:09:36 -0700 (PDT) GUGLHUPF wrote: > Hi, > fairly new to git. Today I did a "git add somefile" and then decided > I wanted to unstage it. I did then a "git rm -f somefile". There was > no git command in between. Particularly no commit. > > git

Re: [git-users] git merge -- resolving conflicts?

2016-07-29 Thread Konstantin Khomoutov
On Fri, 29 Jul 2016 09:10:06 -0700 Michael wrote: > After doing a "git merge", I wind up with a few conflicts. > > My files have the three states. > > I am finding that I almost always want the third state (between === > and >>>) to resolve these conflicts. > > How can I

Re: [git-users] Moving a change from one branch to another?

2016-07-25 Thread Konstantin Khomoutov
On Sun, 24 Jul 2016 23:26:20 -0700 Michael wrote: > How do I move a *change* (instead of a whole file) from one branch to > another? > > keybounceMBP:realisticfluids michael$ git diff stash^1 stash -- > RealisticFluids.java diff --git >

Re: [git-users] Marking a branch "closed"?

2016-07-20 Thread Konstantin Khomoutov
On Wed, 20 Jul 2016 14:08:50 -0400 wor...@alum.mit.edu (Dale R. Worley) wrote: > > Lets say I've got a topic branch. I've made a bunch of commits. It's > > messy. But it's done. > > > What do I do with the leftover? I thought I could tag it as > > "closed", but I can't use the same tag more than

Re: [git-users] Need Suggestions on Git Bitbucket or Stash

2016-07-20 Thread Konstantin Khomoutov
On Wed, 20 Jul 2016 07:41:52 -0700 (PDT) Sanjiv Kumar wrote: [...] > I am looking for inputs and suggestions on the following workflow: > > 1. Can we do the contributions stuff in public repo using > stash/bitbucket? I think we can do it using forking and pull.

Re: [git-users] git-cvsexportcommit issue

2016-07-13 Thread Konstantin Khomoutov
On Wed, 13 Jul 2016 04:02:27 -0700 (PDT) Niranjan C wrote: > im not able to import from project from git to cvs with > "cvsexportcommit" it always gives error as this command does not > exist please help... apt-get install git-cvs -- You received this message

Re: [git-users] Permissions problem.

2016-06-28 Thread Konstantin Khomoutov
On Tue, 28 Jun 2016 06:46:13 -0700 (PDT) Michał Urban wrote: > Oh, gosh - I've made a mistake in my question, I meant he should be > capable of doing git *PUSH*. When I limit his write permission he > can't do it, but... when he has a write privileges - he is able to

Re: [git-users] Git pull output

2016-06-28 Thread Konstantin Khomoutov
On Tue, 28 Jun 2016 04:17:21 -0700 (PDT) Michał Urban wrote: > Hi, I would like to ask what is depicted in git pull output: > > e.g. > > file1 | 4+- > file2 | 272 ++ > file3 | 184 + > file4 | 11 +- > > etc. Git pull performs

Re: [git-users] Submodules list from a mirror.

2016-06-22 Thread Konstantin Khomoutov
On Wed, 22 Jun 2016 06:28:34 -0500 Anand Desai wrote: > If the superproject knows it's submodules( which it does), is there a > way to extract that info from a mirror of the super project? Yes. Fetch the revision of interest from that "mirror of the super project" and

Re: [git-users] Re: Setup Git to have security based on sub folders

2016-06-15 Thread Konstantin Khomoutov
On Tue, 14 Jun 2016 07:33:22 -0700 (PDT) arjun dhar wrote: > I have a project with multiple sub-modules and some common build file > @ the root level of the project. > > Ideally I want to have each module as a separate repo, but they are > all part of the same repo. >

Re: [git-users] compactionHeuristic=true is not used by interactive staging

2016-06-14 Thread Konstantin Khomoutov
On Tue, 14 Jun 2016 05:53:46 -0700 (PDT) Alex Prengère wrote: > I just did a fresh clone of git from Github and installed the version > 2.9. > > I tried the new compactionHeuristic = true, which is awesome. > The only thing that struck me was that this option was not

Re: [git-users] Git log for specific branch

2016-06-14 Thread Konstantin Khomoutov
On Tue, 14 Jun 2016 03:47:45 -0700 (PDT) Maheshwaran A N wrote: > How to list all the commits done in a specific branch. As you all > know, git log list the commits from all the branches (actual commits > in that branch+ topic branches which got merged into). No, the `git

Re: [git-users] Is 'git-add' thread safe?

2016-06-14 Thread Konstantin Khomoutov
On Mon, 13 Jun 2016 21:24:55 -0700 (PDT) Jack Poon wrote: > I am trying to parallelize git activities for a large git repository. > Would like to know if the inner core of git-add is thread-safe? For > example, > > % git add file1 & > % git add file2 & > % git add file3 &

Re: [git-users] Issues with some files in Windows platform

2016-06-12 Thread Konstantin Khomoutov
On Fri, 10 Jun 2016 00:29:30 -0700 (PDT) Maheshwaran A N wrote: > I am facing a serious problem in GIT Bash for some files. These files > are showing as 'modified' in git status, even it is not modified. [...] To those who's interested in this issue, it was reported by

Re: [git-users] trouble with submodule paths

2016-06-12 Thread Konstantin Khomoutov
On Wed, 8 Jun 2016 09:40:15 -0700 (PDT) Derell Licht wrote: > > Before we begin, is there any real pressing reason to keep things > > this way? > > Only that I'm new to Git and have never done a conversion like this > before. At my previous company they used Atlassian

Re: [git-users] Adding copyright right notice to Git repository

2016-06-10 Thread Konstantin Khomoutov
On Fri, 10 Jun 2016 09:03:37 -0700 (PDT) Jack Poon wrote: > I am interested in adding a copyright notice and some meta-tagging to > all source files and all revisions in an existing git repository. > Essentially, creating an entire new Git repository from the old one, > but

Re: [git-users] trouble with submodule paths

2016-06-08 Thread Konstantin Khomoutov
On Wed, 8 Jun 2016 08:24:10 -0700 (PDT) Derell Licht wrote: > Here at my company, we are moving from Subversion to Git. I have > converted several of our projects over to Git, with submodules, and > all is working fine... > > for me, on Windows 7 64-bit... > > However,

Re: [git-users] How do I use GIT to download latest version of a project

2016-06-08 Thread Konstantin Khomoutov
On Wed, 8 Jun 2016 07:47:08 -0700 (PDT) Tony Girgenti wrote: > I don't want to create a repository or contribute to any repository > or make any commits or do anything that involves using GIT as a > version control system. > > I simply want to download the latest software

Re: [git-users] master reset to current develop branch

2016-06-07 Thread Konstantin Khomoutov
On Tue, 7 Jun 2016 09:52:52 -0700 (PDT) Lance Kastel wrote: > what is difference between git merge ..theirs and rebase, why would I > want to consider rebase? [...] > > 1. https://git-scm.com/book/en/v2/Git-Branching-Rebasing I have provided the link cited above in the

Re: [git-users] master reset to current develop branch

2016-06-07 Thread Konstantin Khomoutov
On Tue, 7 Jun 2016 09:11:21 -0700 (PDT) Lance Kastel wrote: > New to Git, I have been using bitbucket for my Git repo (as my > current application used to involve off shore development), looks > like my master was not synced up with the current development branch. > How

Re: [git-users] Remote site setup

2016-06-02 Thread Konstantin Khomoutov
On Thu, 2 Jun 2016 06:52:33 -0700 (PDT) Craig Boldy wrote: > Yes I have ssh access and git is also installed. Well, OK, so there are two parts to this: a simple one and a complex one. The simple one is that serving Git repos on an SSH-enabled machine is a no-brainer.

Re: [git-users] Remote site setup

2016-06-02 Thread Konstantin Khomoutov
On Thu, 2 Jun 2016 05:39:55 -0700 (PDT) Craig Boldy wrote: > Hello everyone. I'm wanting to start using git on my new projects but > I'm a total noob. > So I have installed git on my Linux server my question is how do I > create the repository of an existing site? What

Re: [git-users] git status

2016-06-01 Thread Konstantin Khomoutov
On Wed, 1 Jun 2016 08:30:55 -0700 (PDT) Sharan Basappa wrote: > I need some help on git status. > > When I do git status in my project directory, I see 3 categories as > follows: > > 1) Changes to be committed: > 2) Changed but not updated: > 3) Untracked files: > >

Re: [git-users] recover added file

2016-05-31 Thread Konstantin Khomoutov
On Tue, 31 May 2016 08:13:15 -0700 (PDT) Sharan Basappa wrote: > As I make changes to my files, I have been adding them to git repo > but haven't been committing them. > Today, due to an incorrect switch to the tool, I ended up overwriting > a file I was working on. >

[git-users] Git Ignore File

2016-05-31 Thread Konstantin Khomoutov
Isn't the manual page you linked to absolutely explicit about why your pattern does not match anywhere in the directory tree? It even gives an example. For further details, google for man+3+fnmatch and read on its behaviour. If you need the pattern to match anywhere in the tree, prepend "**/"

Re: [git-users] pushing referenced librarys

2016-05-30 Thread Konstantin Khomoutov
On Sat, 28 May 2016 17:19:34 -0700 (PDT) "'dev_aka' via Git for human beings" wrote: > I am having trouble pushing my referenced library to git, I am > working on eclipse and i am using a jar file which is inside lib > package (Project/src/lib). When i push the

Re: [git-users] How to clone a particular revision?

2016-05-26 Thread Konstantin Khomoutov
On Thu, 26 May 2016 08:44:03 -0700 Michael wrote: > > Impossible with `git clone` as it's tailored for the most common > > case which is "get everything". > > You need a two-step operation: > > > > git init vlc > > cd vlc > > git fetch https://github.com/videolan/vlc.git

<    1   2   3   4   5   6   7   8   9   10   >