[git-users] git push does not update remote workdir

I do execute the following steps to create on DEBIAN Server a 1) git bare repo; 2) a working dir, where the files are copied after local git push; 3) a local clone on Windows, bare server repo is cloned. I executed the following commands: # SERVER: Setup git bare repo on server on Debian Whe

Re: [git-users] git push does not update remote workdir

any useful info. I will test your suggestion(s) to debug the problem. Regards, Konrad 2015. április 24., péntek 21:42:47 UTC+2 időpontban Konstantin Khomoutov a következőt írta: > > On Fri, 24 Apr 2015 11:59:33 -0700 (PDT) > Konrád Lőrinczi > wrote: > > [...] > >

Re: [git-users] git push does not update remote workdir

will always have exactly the same content )? Basically I would need mirroring. Any ideas for these 2 problems? Thanks is advance, Konrad Lorinczi 2015. április 24., péntek 21:42:47 UTC+2 időpontban Konstantin Khomoutov a következőt írta: > > On Fri, 24 Apr 2015 11:59:33 -0700 (PDT)

Re: [git-users] git push does not update remote workdir

Unfortunately push-to-checkout did not result files in workdir after pushing to server, so it was not usable for me. push-to-checkout file content: #!/bin/sh export GIT_WORK_TREE=/domains/site/test-workdir/. export GIT_DIR=/domains/git/site-bare.git/ cd $GIT_DIR git checkout -f The steps I do:

[git-users] Merge conflict error, when there was no change in mentioned file

I have a site local repo and a remote repo. Local repo contains the 1-2 month old content of remote repo. I try to pull the whole content into local repo. git pull origin master From ssh://.../site.git * branchmaster -> FETCH_HEAD ... CONFLICT (add/add): Merg

Re: [git-users] Merge conflict error, when there was no change in mentioned file

rad 2015. május 16., szombat 14:37:28 UTC+2 időpontban Philip Oakley a következőt írta: > >  > *From:* Konrád Lőrinczi > > *To:* git-...@googlegroups.com > *Sent:* Saturday, May 16, 2015 1:03 PM > *Subject:* [git-users] Merge conflict error, when there was no change in >

Re: [git-users] Merge conflict error, when there was no change in mentioned file

kezőt írta: > >  > *From:* Konrád Lőrinczi > > *To:* git-...@googlegroups.com > *Sent:* Saturday, May 16, 2015 1:03 PM > *Subject:* [git-users] Merge conflict error, when there was no change in > mentioned file > > I have a site local repo and a remote repo. > Local repo c

Re: [git-users] Merge conflict error, when there was no change in mentioned file

roblem? I note > that your 'git status' (in the original post) didn't give the mode change, > while the post suggests it would. > > Philip > > > - Original Message - > *From:* Konrád Lőrinczi > *To:* git-...@googlegroups.com > *Cc:* philip..

Re: [git-users] Merge conflict error, when there was no change in mentioned file

I checked line endings in Notepad++ and both were unix. Unfortunately I can not reproduce the problem anymore, as when I fixed the problem I stepped to the next development problem. sha1 compare and binary check are good idea for next time. Thanks your help & ideas anyway, Konrad 2015. máju

[git-users] Live & local development server

I have a live server & a local development server, both Linux. I develop and have my local repo under Windows. Both Linux servers are connected to my local repo as remote repos. My problem is, that local server has some localized content, like config.php. Example difference: Live server: domai

Re: [git-users] Live & local development server

Is there some specific Git or Linux tool for such task? I mean is there some use case for what other developers are using? What hooks should I use forth & back? Thanks, Konrad 2015.05.16. 22:03 ezt írta ("Philip Oakley" ): > *From:* Konrád Lőrinczi > I have a l

[git-users] How to checkout files from another branch, based on a filelist from a text file?

I tried to merge 2 branches, but there are so much file difference (more hundred files), that I can not merge them in one step. I create a diff file containing different files between branch dev & local_dev. git diff dev..local/dev --name-only >diff_dev+local-dev_files.txt Removed HEAD from the

Re: [git-users] How to checkout files from another branch, based on a filelist from a text file?

Thanks everyone for the suggestions! I used first and worked fine. But I save all for later use. Thanks again, Konrad 2015.05.19. 18:21 ezt írta ("Konstantin Khomoutov" < flatw...@users.sourceforge.net>): > On Mon, 18 May 2015 22:05:48 -0400 > wor...@alum.mit.edu (Dale R. Worley) wrote: > > > Ko

[git-users] How to add a file later to a commit?

How can I add a file later to a commit? I created a new branch and submitted a commit with 2 files. I observed, that one more file should have been submitted with this commit, so I would like to add a file to an earlier commit. Any solution for this? Thanks, Konrad -- You received this messa

[git-users] Re: git push does not update remote workdir

Finally I have come out with this script to check out files to different workdirs (depending on branch) after push. I merged some suggestions I found on the net and this script seems to work fine. post-receive hook script: #!/bin/sh export GIT_DIR=/home/git/site-bare.git/ echo "GIT

[git-users] Select a set of files to work on them

I would like to select a set of files to work on them, then merge them back to the dev branch. My problem is, that I have two repos, a production one on the live server and a local one on the local development server. When I make a diff between them, I see there are too many changes between the

Re: [git-users] Select a set of files to work on them

/files.php I know, this is something I should suggest to developers. Until something like this is not implemented, I will have to stick with subtrees feature. 2015. június 5., péntek 9:52:25 UTC+2 időpontban Magnus Therning a következőt írta: > > On 4 June 2015 at 21:08, Konrád Lőrincz

[git-users] Can not undo multiple git rebase using git reflog & git reset --hard

I did a few git rebase interactive between branches, but when I use git reflog & git reset --hard HEAD@{N} I can not get the same branch hierarchy as it was before. git reflog git reset --hard HEAD@{14} Now all local_dev, local_dev_appuserimport-under_work, local_dev_app_import_merge-under_work

Re: [git-users] Can not undo multiple git rebase using git reflog & git reset --hard

Thanks very much! Konrad 2015. június 10., szerda 17:04:44 UTC+2 időpontban Rémi Rampin a következőt írta: > > 2015-06-09 15:55 GMT-04:00 Konrád Lőrinczi >: > >> I did a few git rebase interactive between branches, but when I use git >> reflog & git reset --h

[git-users] Error when merging iscsi/nodes directory from linux to windows because of colon in filename

I added etckeeper (which uses GIT) to my Debian server, so I can have versioning over the /etc directory. But when I clone to a Windows machine I get the following error: git clone ssh://user@mysite/etc test-etckeeper Cloning into 'test-etckeeper'... remote: Counting objects: 2124, done. remote:

Re: [git-users] Error when merging iscsi/nodes directory from linux to windows because of colon in filename

I send the use case to the git developer list? Thanks, Konrad 2015.06.19. 18:28 ezt írta ("Konstantin Khomoutov" < flatw...@users.sourceforge.net>): > On Fri, 19 Jun 2015 08:41:08 -0700 (PDT) > Konrád Lőrinczi wrote: > > [...] > > But when I clone to a Windows

Re: [git-users] Error when merging iscsi/nodes directory from linux to windows because of colon in filename

ezt írta ("Konstantin Khomoutov" < flatw...@users.sourceforge.net>): > On Fri, 19 Jun 2015 21:08:00 +0200 > Konrád Lőrinczi wrote: > > > Thanks very much for your answer! > > It is really a deeply technical answer. > > Maybe are you one of develo

[git-users] Git rebase including initial commit

How to rebase the following commits? I have: A---B---C orig D---E---F dev I would like to rebase dev over orig branch, so I have the following result: A---B---C---D---E---F I tried this: git rebase orig dev But the result the following. A---B---C orig \ E---F dev

Re: [git-users] Git rebase including initial commit

Konstantin Khomoutov a következőt írta: > > On Wed, 24 Jun 2015 10:13:22 -0700 (PDT) > Konrád Lőrinczi > wrote: > > > How to rebase the following commits? > > > > I have: > > A---B---C orig > > D---E---F dev > [...] > > Does simple &

Re: [git-users] Git rebase including initial commit

Branch history before rebase is following: $ git log orig --oneline 61ef11b C 0458ee6 B e714739 A $ git log dev --oneline 4f9a02e F 69eabea E dbdf75f D 2015. június 24., szerda 20:06:52 UTC+2 időpontban Konrád Lőrinczi a következőt írta: > > $ git rebase --root --onto orig dev &

Re: [git-users] Git rebase including initial commit

t; >> On Wed, 24 Jun 2015 11:13:26 -0700 (PDT) >> Konrád Lőrinczi wrote: >> >> > Branch history before rebase is following: >> > $ git log orig --oneline >> > 61ef11b C >> > 0458ee6 B >> > e714739 A >> > >> > $ git l

Re: [git-users] Git rebase including initial commit

24 Jun 2015 11:06:52 -0700 (PDT) > Konrád Lőrinczi > wrote: > > > $ git rebase --root --onto orig dev > > First, rewinding head to replay your work on top of it... > > Applying: E > > Applying: F > > > > > > The result is: > > A

Re: [git-users] Git rebase including initial commit

$ git log --graph --decorate --oneline orig dev * 4f9a02e (HEAD -> dev) F * 69eabea E * dbdf75f D * 61ef11b (orig) C * 0458ee6 B * e714739 A 2015. június 24., szerda 20:26:29 UTC+2 időpontban Konstantin Khomoutov a következőt írta: > > On Wed, 24 Jun 2015 11:13:26 -0700 (PDT)

[git-users] Git diff problem with cvs $id$

I have two branches and the only difference between them is the cvs $id$, which is expanded in one branch and not expanded in the other. Is there a way to show git diff as unchanged? Also should not show conflict in case of git merge. Any suggestions? -- You received this message because y

Re: [git-users] Git diff problem with cvs $id$

> > Any suggestions? > > Remove the it! If you aren't using CVS those lines serve no purpose > at all. Even if you do use CVS the line is of dubious usefulness. > Unfortunately I can not remove them. They are in an earlier branch of a software repo, which has more thousand files. So I need

Re: [git-users] Git diff problem with cvs $id$

> So which repo contains expanded keywords? If yours, then do a > recursive `sed` (or whatever) invocation on all that thousand of files > and make a single commit titled "Normalize CVS keywords". Then merge > normally. If the foreign repo contains expanded keywords, may be > `git rerere

[git-users] Git doesn't detect change, if file modification time is restored to original one

I wrote a search & replace perl script, which recursively searches files and replaces text in them. After replace, it restores original modification time (mtime) of file. Interesting, that git status doesn't show replaced changes, if the mtime is same as original. Is there a way to force git s

Re: [git-users] Git doesn't detect change, if file modification time is restored to original one

antin Khomoutov a következőt írta: > > On Wed, 22 Jul 2015 11:17:13 -0700 (PDT) > Konrád Lőrinczi > wrote: > > > I wrote a search & replace perl script, which recursively searches > > files and replaces text in them. After replace, it restores original &

Re: [git-users] Git doesn't detect change, if file modification time is restored to original one

I tried: $ git update-index --refresh $ git status On branch feature/file_restore_date nothing to commit, working directory clean $ git update-index --really-refresh $ git status On branch feature/file_restore_date nothing to commit, working directory clean Unfortunately none of them was able

[git-users] Copy change history from local repo to live repo?

I have 2 git repositories: Local and Live Both Local & Live are Linux Debian 7.8, using Git 2.4. Local/Master - A - B - C - D - E Live/Master - A - B Is there a way to copy the C - D - E part of history of Local to Live? So result should look like this: Live/Master - A - B - C - D - E I do

Re: [git-users] Copy change history from local repo to live repo?

My use case: I have 2 servers installed. 1) LOCAL (virtual Debian server on my development computer), for development & testing (No repo, it is just a deployment target of local/master branch). 2) LIVE (Debian server), the production website (Also stores the central bare Git repo). Branches on Lo

[git-users] etckeeper doesn't commit changes automatically to /etc

Somewhy since I upgraded to Debian Jessie 8.3 and compiled GIT 2.6.0, etckeeper v1.15 doesn't doesn't commit changes automatically to /etc. Reproducing steps: 1) create file ddd.txt locally (Windows 7, git version 2.6.3.windows.1) with content: root@local-debian8:/etc# printf "ddd\n

[git-users] Re: etckeeper doesn't commit changes automatically to /etc

FIX: 6) Push it to NON-Bare repo on server (GIT repo, created by etckeeper) 2016. február 17., szerda 16:52:56 UTC+1 időpontban Konrád Lőrinczi a következőt írta: > > Somewhy since I upgraded to Debian Jessie 8.3 and compiled GIT 2.6.0, > etckeeper v1.15 doesn't doesn&#x

[git-users] Re: etckeeper doesn't commit changes automatically to /etc

FIX2: subject correctly should be this: etckeeper doesn't checkout files automatically to /etc -- 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+

[git-users] Merge conflicts in files with no difference in file compare

I have two branches and I would like to merge them. I have merge conflicts in more thousand files, but most of these have no difference in file compare. I'm using Windows 7 Pro with Git Extensions to work locally, repo server is Debian 8. - Debian 8 git version: 2.6.0 - Windows 7 git version: 2.6