Re: [git-users] How to handle a longrunning branch

On Tue, 17 Nov 2015 23:47:13 -0800 (PST) mike wrote: > > > I have had a branch, feature_xyz, for a long time ( yes I know I > > > should not but it was not my call). Problem is I have not updated > > > it with changes from master. So I started to do a regular rebase

Re: [git-users] contaminated git log

On Tue, 17 Nov 2015 00:06:19 -0800 (PST) Daniel Doron wrote: > >> > see screen capture here: http://postimg.org/image/esgjyhk9j/ > >> > had to black out some parts because of proprietary info...but I > >> > hope you get the gist. > >> > >> This "remote" stuff seems

Re: [git-users] How to handle a longrunning branch

On Tue, 17 Nov 2015 10:02:03 -0800 (PST) mike wrote: > I have had a branch, feature_xyz, for a long time ( yes I know I > should not but it was not my call). Problem is I have not updated it > with changes from master. So I started to do a regular rebase ( i > want

Re: [git-users] contaminated git log

On Mon, 16 Nov 2015 08:28:37 -0800 (PST) Daniel Doron wrote: > > > see screen capture here: http://postimg.org/image/esgjyhk9j/ > > > had to black out some parts because of proprietary info...but I > > > hope you get the gist. > > > > This "remote" stuff seems to be

Re: [git-users] contaminated git log

On Mon, 16 Nov 2015 05:52:22 -0800 (PST) Daniel Doron wrote: > see screen capture here: http://postimg.org/image/esgjyhk9j/ > had to black out some parts because of proprietary info...but I hope > you get the gist. This "remote" stuff seems to be reachable from two

Re: [git-users] contaminated git log

On Mon, 16 Nov 2015 05:17:11 -0800 (PST) Daniel Doron wrote: > I have a local repository to which I added a remote so I can cherry > pick some commits. > now, I removed the remote and any related branches, as I no longer > need it. my problem is that "git log --all"

Re: [git-users] CApath: none ????

On Mon, 16 Nov 2015 05:56:31 -0800 (PST) Maurizio wrote: > I am rather new to git. > > Suddenly I get this error message when I try to add (or push) to > remote: > > Add Remote Repository: unable to access > 'https://mau...@bitbucket.org/mauvia/libro_arc.git/':

[git-users] git on windows - unable to create file.exe during install

I'd say this file is either kept opened (being executed counts as this) by some other program or — less likely, I admit — have some weird permissions set on it so that you really have no permissions for deleting it (Windows ACLs are powerful but very complicated). So I'd first get the

Re: [git-users] Re: git fsck error - duplicate file entries - different then existing stackoverflow scenarios

On Thu, 12 Nov 2015 15:37:15 -0800 (PST) Wind Over Water wrote: Hi! > Some more info: > > Looking deeper into the first reported duplicate: [...] Did you see the Jeff King's response on the main Git list (he Cc'd you)? If yes, did it help? If no, please consider

Re: [git-users] Re: git fsck error - duplicate file entries - different then existing stackoverflow scenarios

On Fri, 13 Nov 2015 18:27:35 +0300 Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: [...] > Did you see the Jeff King's response on the main Git list (he Cc'd > you)? If yes, did it help? [...] > You can check the fate of your messages here [1] ;-) > > 1.

Re: [git-users] git fsck error - duplicate file entries - different then existing stackoverflow scenarios

On Wed, 11 Nov 2015 14:30:40 -0800 (PST) Wind Over Water wrote: > I have a repo that is giving a 'git fsck --full' error that seems to > be different from the existing questions and answers on stackoverflow > on this topic. For example, in our fsck error it is not obvious >

Re: [git-users] git-new-workdir, and updating local workdir

On Mon, 9 Nov 2015 22:11:04 +0100 Gergely Polonkai wrote: [...] > > In case you "kind of heard" exchanging histories between non-bare > > repos is a no-no, I can assure you that's nonsense -- while you > > obey certain simple rules. Actually, the single rule: don't try to >

Re: [git-users] Add feature like "git number"

On Mon, 9 Nov 2015 01:02:46 -0800 (PST) David Votrubec wrote: > There is great plugin into Git named Git-Number, > you can check it out it here https://github.com/holygeek/git-number [...] This list is about helping newbie Git users solve their problems with using Git

Re: [git-users] git-new-workdir, and updating local workdir

On Mon, 9 Nov 2015 15:08:37 +0300 Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: [...] > > In ~/src/my-repo-branch/master running git log will show the latest > > commits to master, but the working directory will be out of date. > > > > Is it possible

Re: [git-users] git-new-workdir, and updating local workdir

On Mon, 09 Nov 2015 17:59:13 + phillip.l...@newcastle.ac.uk (Phillip Lord) wrote: [...] > I was trying something slightly evil > though, which breaks this. I've been using unison to sync > > ~/src/my-repo > > between machines. [...] But why? If you have unison working between those

Re: [git-users] Return values of git commands

On Fri, 6 Nov 2015 08:26:25 -0800 (PST) Wink Saville wrote: > git config alias.sdiff '!'"git diff && git submodule foreach 'git > diff'" [...] > Thus, the alias.sdiff makes sense, but is there documentation on the > return values? I don't think these return values are

Re: [git-users] "Index file" -- what is it?

On Tue, 3 Nov 2015 14:42:33 +0300 Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: [...] > [1] and [2] -- in this order -- are good at explaining what the > staging area is all about. [...] > 1. https://jwiegley.github.io/git-from-the-bottom-up/ > 2. https://git-sc

Automatic download at git-scm.com does not work (Was: [git-users] Cant download Git)

On Tue, 3 Nov 2015 04:55:22 -0800 (PST) M Hendrickson wrote: > I am trying to download Git. When I click download for Mac OS X it > says "download starting" but the download doesn't start. > > There is a manual download option from sourceforge. But some have > warned me that

Re: [git-users] "Index file" -- what is it?

On Sun, 1 Nov 2015 12:31:59 -0800 Michael wrote: > So I'm starting to be aware that the "index file" isn't a file, but > effectively a full commit that isn't finalized. > > Can someone point me to a good explanation of what the index actually > is, and is not, so I'm not

Re: [git-users] Detect destructive changes betweeen two file versions

On Fri, 30 Oct 2015 05:06:00 -0700 (PDT) Ivan Švaljek wrote: > >> Is it possible to automate an C# app using git, so I get a flag > >> whether the changes in the new file version are destructive or > >> non-destructive? Bonus question: is there a functionality in git > >>

Re: [git-users] Detect destructive changes betweeen two file versions

On Fri, 30 Oct 2015 10:59:49 -0700 (PDT) Ivan Švaljek wrote: > Yes I would like to get the diff state in a C# program of mine, Git > is one candidate if it's the easiest way to get such a state. > Git is also a candidate because it has some merge functionality if > I'm

Re: [git-users] Git behind nginx reverse proxy

On Thu, 29 Oct 2015 01:17:58 -0700 (PDT) Péricé Robin wrote: > > > I want (if possible) to use git behind a nginx reverse proxy. > > > This is my configuration. [...] > > > I have 2 virtual machines. The first one host Nginx and the > > > second host my Git repositories.

Re: [git-users] want to retain my change of files, but want updated version of files.

On Thu, 29 Oct 2015 01:41:23 -0700 (PDT) nmh wrote: > I did a > > 1) git clone > 2) git branch -b B1 > 3) git checkout B1 The steps 2-3 look strange. You either do `git branch B1` followed by `git checkout B1` or just `git checkout -b B1` which combines the former

Re: [git-users] how to fecth a fil at specifick checksum ?

On Tue, 27 Oct 2015 17:47:18 -0700 (PDT) Jorge V GM wrote: > I have this case: > > a. I develop a html file in several days with daily commit > b. some weeks after I noticed that I lost part of the code > c. I located a code 3 commits ago. > > then How I can fetch from the

Re: [git-users] Git behind nginx reverse proxy

On Wed, 28 Oct 2015 09:20:41 -0700 (PDT) Péricé Robin wrote: > I want (if possible) to use git behind a nginx reverse proxy. This is > my configuration. > > >

Re: [git-users] does `git commit` modify $GIT_DIR/index?

On Tue, 27 Oct 2015 22:12:51 -0700 (PDT) ozzloy wrote: > i am writing a script to test exactly what's staged for the next > commit. this should work even on root commit, and in orphan branches, > so using stash by itself doesn't work because there's no HEAD for > stash to stash

Re: [git-users] does `git commit` modify $GIT_DIR/index?

On Sat, 24 Oct 2015 17:29:30 -0700 (PDT) ozzloy wrote: > does `git commit` modify $GIT_DIR/index? > i just diffed index from before and after a commit and found no > difference. i'm guessing this is reliable behavior, but i wanted to > make sure. it seems like the idea of

Re: [git-users] Integration between GIT and other systems

On Thu, 22 Oct 2015 06:27:49 -0700 (PDT) Fabiano Amorim Oliveira wrote: > I need to know if it's possible to have a polling mechanism that > checks what event occurred, then push a message to another system - > such as third party systems. Or the source control tool

Re: [git-users] Info about git commit

On Thu, 22 Oct 2015 08:03:52 -0700 (PDT) vijay...@dssd.com wrote: > I am very new to git; This question may have been asked before, if > so, sorry to post it again..\ > > - Given a git commit, how to get all information about that commit, > like who made that commit; author details; time of

Re: [git-users] Git Software Architecture

On Wed, 21 Oct 2015 09:36:04 -0700 Aravind Ganesan wrote: > Being software architecture class, > I have to get some diagrams of the prescriptive architecture and > analyse how it has digressed ( or maybe has remained the same ). This > is part of my academic project.

Re: [git-users] Git Software Architecture

On Tue, 20 Oct 2015 20:02:54 -0700 (PDT) Aravind Ganesan wrote: > I am doing an architecture analysis of Git and I want the > prescriptive architecture of the system ( or the architectures for > the earlier versions ). I searched all over but couldnt get any > material

Re: [git-users] Exit Code 128 - ssl3_check_cert_and_algorithm:dh key too small

On Mon, 19 Oct 2015 23:14:27 -0700 (PDT) Kunal Kishan wrote: > OS - Windows 7 Enterprise , Intel Xeon CPU , 16GB RAM > Git Version : 2.6.2.window.1 > Git Command -> *git ls-remote --tags --heads > https://github.com/zurb/bower-foundation.git* > Behind Proxy : YES > >

Re: [git-users] how to git clone/pull/push another PC without entering password ?

On Sat, 17 Oct 2015 02:45:28 -0700 (PDT) liu wen wrote: > I have two laptop A and B, I want to create a shared repository on A, > and I can clone/pull/push the shared repo on B. > is it possible? if so, what are the clone command like? > > and do I need to enter

Re: [git-users] How do I tell git to use openssl in /usr/local

On Wed, 14 Oct 2015 07:56:29 -0700 (PDT) Greg Ramos wrote: > I am trying to build git from source. I have new versions of openssl > and libcurl. When I type 'make', the build wants to use libcryto > in /usr/lib64. How do I tell the build to use what's in /usr/local? Usually

Re: [git-users] HELP git cant recognize ANY commands

On Mon, 12 Oct 2015 23:10:52 +0200 Magnus Therning wrote: > > > > This is what I got...(Hope I did it right...). The git version is > > 2.6.1.windows.1 > > All we see

Re: [git-users] Re: Undefined symbols for architecture x86_64: "_reencode_string_iconv"

On Mon, 12 Oct 2015 12:54:20 -0700 (PDT) mham...@sandia.gov wrote: > FWIW, I'm doing a farily straightforward build from source > > tar zxf git-2.6.1.tar.gz > cd git-2.6.1 > export NO_APPLE_COMMON_CRYPTO=1 > make configure > ./configure --prefix=/blah/blah/blah > make As usually, is [1] what

Re: [git-users] An unbelievably newby question

On Mon, 12 Oct 2015 11:19:21 -0700 Kenoli Oleari wrote: > Thanks for these replies. I will jump in and try them out. > > For all the cheers about GIT, If find it incredibly difficult to use > (or to even understand) > > I appreciate the support. I wonder if you have any

Re: [git-users] HELP git cant recognize ANY commands

On Mon, 12 Oct 2015 08:01:41 -0700 (PDT) Tzahalla Sircher wrote: > So I run windows 8.1, and Im using Gitbash on it. The line that > appears now before Typing any command is bash.exe"-3.1$ Yes, that's weird. What's your version of Git for Windows? Where did you downloade

Re: [git-users] HELP git cant recognize ANY commands

On Sat, 10 Oct 2015 20:58:47 -0700 (PDT) Tzahalla Sircher wrote: > I know its because I have " Before the command line (blabash32": $) > but I dont know how to change it so the quotation marks arent there > anymore cause its been canceling any command. HELP. Also, changing >

Re: [git-users] error: unknown type name 'SecTransformRef'

On Thu, 8 Oct 2015 16:37:54 -0700 (PDT) mham...@sandia.gov wrote: > We've been using git-1.7.3 for some time, and decided to bite the > bullet and bring it up-to-date. git-2.6.1 built fine on all of our > linux-type machines, but failed with the error shown below on our Mac > OS X 10.9 systems: >

Re: [git-users] Two repositories in one Visual studio project

On Wed, 7 Oct 2015 12:32:49 +0200 Magnus Therning wrote: > > No I like to do a copy with history from a repository into a > > directory of another repository > > > > git T8Suite TrionicSuites/T8Suite > > > > Both T8Suite and TrionicSuites are repros > > I suspect

Re: [git-users] Clone sub-directory in the main repository

On Tue, 6 Oct 2015 03:39:30 -0700 (PDT) Anand Aravind wrote: > I had pushed my code in the structure below: > > Source: > >Win32 >Win64 >Ubunutu64 >Ubuntu32 > > I had to clone the code form Win32 Folder only. That's impossible due to the data model

Re: [git-users] How can I ignore insignificant change during merge ?

On Mon, 5 Oct 2015 05:11:29 -0700 (PDT) Jens Brejner wrote: > I need to merge a branch, +100k changes. The vast majority of changes > are insignificant, because they only represent a screen position in > the editor, so these changes should never have been in git - but but >

Re: [git-users] Two repositories in one Visual studio project

On Fri, 2 Oct 2015 06:52:33 -0700 (PDT) Meindert Oldenburger wrote: > Good point. What left is how to make a distinction in the repository > of the different projects? For example I move T7Suite and T8SuitePro > to CommonSuite. Are the following actions a good approach?: >

Re: [git-users] GITK: Crashes when calling it with a branch name and a Non-English locale

On Wed, 30 Sep 2015 22:58:23 -0700 (PDT) Uli He wrote: > I upgraded to version 2.6.0 and now I'm observing crashes when > starting gitk and specifying a branch: [...] > $ gitk master # crashes > Error in startup script: bad menu entry index "Ansicht bearbeiten ..."

Re: [git-users] Git commit was done twice and then git review - does not work

On Tue, 29 Sep 2015 05:31:07 -0700 (PDT) nmh wrote: > I cloned a git repository, made some changes.. i did git commit .. > forund that changes are not complete , made some more changes > to the same files, and now i did git commit again. > Now i did git review to submit

Re: [git-users] Spacing changes and applying patches/diffs

On Sun, 27 Sep 2015 23:47:23 -0700 Michael wrote: > So how do you deal with patches that are mostly wrecked by spacing > changes? Try `git merge -s recursive -X ignore-space-change `? Please search the git-merge manual page for the "white" keyword. [...] -- You received

Re: [git-users] Is git rebase same as ClearCase rebase?

On Thu, 24 Sep 2015 08:06:23 -0700 (PDT) Jirong Hu wrote: > Hi All > > I am new to git but familiar with ClearCase. I think the git merge is > same as the ClearCase merge/deliver, but is the git rebase same as > ClearCase rebase? Any different? I think after reading [1],

Re: [git-users] Does companies hire git administrators?

On Thu, 24 Sep 2015 08:24:49 -0700 (PDT) Jirong Hu wrote: > I am new to git, and was a clearcase administrator. Just wondering > for companies using git, do they usually have a git administrator or > the development team is doing all themselves? A "git administrator" is a

Re: [git-users] Silent install?

On Tue, 22 Sep 2015 03:48:30 -0700 (PDT) Will Lucas wrote: > I was wondering if there are any install flags for git to be > installed silently and to be able to pre-choose the install options > to make it completely silent? Using the standard '/S' flag for > the .exe just

Re: [git-users] Re: git pull/merge without committing local changes

On Fri, 18 Sep 2015 01:46:14 -0700 (PDT) Machiel Kolstein wrote: [...] > Just after reading it for the first time, I see that there is not > only one, but two very well explained answers to my question (I am > not sure yet which one I will chose, because it will take some time

Re: [git-users] Is there a problem with Git 2.5.3 "Start In" folder location?

On Sun, 20 Sep 2015 10:11:13 -0700 (PDT) Patrick Piché wrote: > Hi, I just downloaded the latest Git release; 2.5.3 and I can't seem > to make the Git Bash open in my correct projects folder. > > I go to Properties > Start in and add a valid Path: C:\Users\*me* >

Re: [git-users] git pull/merge without committing local changes

On Thu, 17 Sep 2015 07:22:27 -0700 (PDT) Machiel Kolstein wrote: > I am a newbie with GIT. I previously only had experience with CVS and > SVN. As happens quite commonly, this experience is actively hurting you ;-) But we'll try to help this. > I am working with some other

Re: [git-users] How to get install bits

On Thu, 10 Sep 2015 13:09:09 -0700 (PDT) Gary Foster wrote: > I work for a large company and our firewalls won't allow for the > downloads attempted after the initial installer is executed. > > How can we get a package with all the bits required for the install? Yes. The

Re: [git-users] Question about local files

On Tue, 15 Sep 2015 08:05:01 +0200 Gergely Polonkai wrote: > > > If (locally) in gitbash I > > > create a new branch e.g. 'dev' > > >then create a new file: eg touch style.css > > > then git add, git commit -m "..." > > > > > > and then switch back to master and

Re: [git-users] git-http-backend nearly works

On Mon, 14 Sep 2015 05:23:19 -0700 (PDT) Niklaas Baudet von Gersdorff wrote: > I (nearly) successfully set up `git-http-backend`. Pulling is no > problem but pushing hangs at this stage (just an example git push): > > $ git push > Username for '': niklaas > Password

Re: [git-users] Question about local files

On Mon, 14 Sep 2015 09:45:26 -0700 (PDT) Najgit wrote: > If (locally) in gitbash I > create a new branch e.g. 'dev' >then create a new file: eg touch style.css > then git add, git commit -m "..." > > and then switch back to master and type ls > >

Re: [git-users] help me about the branch creation time

On Fri, 11 Sep 2015 17:03:01 +0800 lei yang wrote: > I want to know the branch creation time, any help ( I don't have > master branch) This information is not stored anywhere in any form. The closest approximation of it you can get is the commit time of the first commit

Re: [git-users] How to use git to save output binary files for certain tags (production releases)

On Thu, 10 Sep 2015 13:37:32 +0200 Gergely Polonkai wrote: [...] > [1] https://github.com/jedbrown/git-fat > [2] https://github.com/alebedev/git-media > [3] http://www.jfrog.com/artifactory/ Another two projects to possibly look at are git-annex and git-lfs. I'm sill

Re: [git-users] How to use git to save output binary files for certain tags (production releases)

On Thu, 10 Sep 2015 00:23:09 -0700 (PDT) pozzu...@gmail.com wrote: > I'm very new to VCS and git, so I have some difficulties to use them. > > I'd like to use git for my embedded projects. I consider a must have > feature the possibility to retrieve the binary files of an old > release. In this

Re: [git-users] How to use git to save output binary files for certain tags (production releases)

On Thu, 10 Sep 2015 16:04:43 +0300 Konstantin Khomoutov <flatw...@users.sourceforge.net> wrote: [...] > The basic idea is like this: once the release build is done, you > > 1) Archive the necessary binary files (that's really > platform-dependent: on Windows, I'd use plain zip

Re: [git-users] How to use git to save output binary files for certain tags (production releases)

On Thu, 10 Sep 2015 11:34:32 -0700 (PDT) pozzu...@gmail.com wrote: > > The simplest solution I can think of, which does not involve any > > tools outside of Git (well, almost), is using the lesser-known fact > > Git's object database is able to store arbitrary data -- not > > necessarily bound to

Re: [git-users] Bug in handling special characters in GIT SVN

On Tue, 8 Sep 2015 02:16:51 -0700 (PDT) Sergiy Barlabanov wrote: > We have recently a problem my dcommiting renamed files containing $ > character in their names. GIT SVN crashed with the error: > > Assertion failed: (svn_uri_is_canonical(child_uri, NULL)),

Re: [git-users] Pushing a rebased branch without --force

On Thu, 3 Sep 2015 19:16:23 +0300 Ram Rachum wrote: [...] > > Yes, since some version `git push` learned the --force-with-lease > > command-line option which does just what you want: makes sure the > > tip of the existing branch is exactly what you expect it to be. > > I

Re: [git-users] Git push URL encoding issue

On Thu, 3 Sep 2015 10:01:01 -0700 (PDT) Bideep Bezbaruah wrote: > This is a service consumed by many users and there is a validation > requirement where every user trying to use this service, needs to be > authenticated against the repo that is passed. For ex: User

Re: [git-users] Git push URL encoding issue

On Thu, 3 Sep 2015 09:24:40 -0700 (PDT) Bideep Bezbaruah wrote: > I have a use case to push files to git using command like: > > git push https://:github.company.com/abcd/devrepo > > master:master > > But, if the password contains special characters like ‘@’ and ‘$’, I

Re: [git-users] Pushing a rebased branch without --force

On Thu, 3 Sep 2015 05:17:34 -0700 (PDT) Ram Rachum wrote: > I've been using Git for years, but only recently I started working > for a big company where they use `git rebase` to maintain a linear > history. > > One problem I have with this is that when I rebase a branch, I

Re: [git-users] Pushing a rebased branch without --force

On Thu, 3 Sep 2015 19:45:11 +0300 Ram Rachum wrote: [...] > I'm really lost in your reply. I had a problem: I want to have a push > command that (1) works even after a rebase and (2) refuses to push > when there's a new commit in the remote branch that doesn't exist in >

Re: [git-users] How to use deploy keys

On Tue, 1 Sep 2015 16:55:39 -0700 (PDT) widgetla...@gmail.com wrote: > I've created a deploy key to use for our build server and associated > the public key with the repos. I cannot, however, for the life of me, > figure out how to connect and clone the repo using the private deploy > key. I have

Re: [git-users] Visually show file history

On Wed, 29 Jul 2015 16:57:30 -0700 Ying Huang huangyi...@gmail.com wrote: [...] So... Could you just freaking try the suggested git difftool commit2 commit2^1 $1 I have changed to git difftool $name^1 $name $1 But some commits are still skipped. approach

Re: [git-users] Visually show file history

On Wed, 29 Jul 2015 08:26:23 -0700 Ying Huang huangyi...@gmail.com wrote: [...] I'm afraid I don't get your problem statement. As I understood it, you told that, 1) say, let the history of hello.txt includes 3 commits, and 2) you'd like to see three diff views -- one for each of

Re: [git-users] Visually show file history

On Wed, 29 Jul 2015 07:48:10 -0700 Ying Huang huangyi...@gmail.com wrote: Hi, great thanks for your attention, Yes, git log --oneline --format %H --follow -- hello.txt is better than using awk. git log --oneline --format %H --follow -- hello.txt \ | while read name; do

Re: [git-users] Visually show file history

On Tue, 28 Jul 2015 10:10:40 -0700 (PDT) 颖黄 huangyi...@gmail.com wrote: Hi, I am trying to visually show a file change history. An easy way to do is to use gitk file, while it is in text [...] My intention is just to show the file change history in a visual tool, for exampel my

Re: [git-users] git fetch doesn't update latest tags on a bare repo.

On Sun, 26 Jul 2015 22:52:21 -0700 (PDT) dexter ietf dexter.i...@gmail.com wrote: git pull is actually the same as if you write git fetch and then git merge. git-fetch doesn't update anything in your working directory, it just download the changes from the remote. Think about it as if I

Re: [git-users] git fetch doesn't update latest tags on a bare repo.

On Thu, 23 Jul 2015 06:44:41 -0700 (PDT) dexter ietf dexter.i...@gmail.com wrote: i have a bare repo, when i do a git fetch, the remote tags are not getting updated, though the 'fetch command' runs successfully. please shed some light. thanks. That's almost zero information in your problem

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

On Wed, 22 Jul 2015 11:17:13 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: 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

Re: [git-users] adding a remote on a private branch.

On Tue, 21 Jul 2015 23:00:23 -0700 (PDT) dexter ietf dexter.i...@gmail.com wrote: Does it work even if the original cloned branch is off of (P), i'm just trying to understand how and why this can work. (Ma) is Machine A (Mb) is Machine B (P) - parent branch Ma - clone P, call it Pa

Re: [git-users] bare repo git gc --aggressive

On Tue, 21 Jul 2015 13:22:56 -0500 John McKown john.archie.mck...@gmail.com wrote: I use git at home. I have my normal working directories. I keep the associated bare repository on a NAS box (accessed with NFS, if that matters). I am wondering if it is a good idea to periodically, say

Re: [git-users] Create a new repository out of sub repository

On Tue, 21 Jul 2015 12:37:20 -0700 (PDT) Dimitris Papageorgiou foryou1...@gmail.com wrote: How am I going to use git filter branch? I tried this with no effect: git filter-branch --msg-filter administrator... I got a message saying: git-rewrite already exists,please remove it Apart from

Re: [git-users] bare repo git gc --aggressive

On Wed, 22 Jul 2015 06:48:06 -0500 John McKown john.archie.mck...@gmail.com wrote: I use git at home. I have my normal working directories. I keep the associated bare repository on a NAS box (accessed with NFS, if that matters). I am wondering if it is a good idea to periodically, say

Re: [git-users] Could not load program git

On Wednesday, July 22, 2015 at 12:34:31 PM UTC+3, John McKown wrote: [...] Probably the best thing to do wold be to see if there is an updated version of git on AIX which will work for you and install it. On my Linux system, git is at 2.4.3! There is a package here:

Re: [git-users] copied form path is not set when using git svn merge/dcommit

On Mon, 20 Jul 2015 15:16:34 -0700 (PDT) Chidveer Reddy chidv...@gmail.com wrote: I have an SVN repo. Repo |_ branch 1 | |_trunk. 1. As an SVN user, i added a new file to branch 1 (file1.txt) 2. Now, i went to the git console and using git-svn, I did

Re: [git-users] git5 export results in AssertionError: -11

On Mon, 20 Jul 2015 10:43:14 -0700 (PDT) Thomas de Rivaz tderi...@google.com wrote: Recently (in last hour) started getting this. Anyone have any insight? We here deal with plain Git, and git5 is some internal Google tool. So please reach for your nearby Git goto guy. -- You received this

Re: [git-users] Create a new repository out of sub repository

On Mon, 20 Jul 2015 06:50:02 -0700 (PDT) Dimitris Papageorgiou foryou1...@gmail.com wrote: I have git init a working directory...here is it C:\Apache24\htdocs\Appointments\Administrator I now want to create git init another directory which sits *above *the

Re: [git-users] ssh admin git accidentally deleted

On Tue, 7 Jul 2015 06:28:49 -0700 (PDT) agnes monest monezone.cl...@gmail.com wrote: Dear all , I accidentally delete ssh admin git, unfortunately there just one admin so I can't make a change in the config and push to the repository. If there's a way undo the change or make an existing user

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

On Mon, 6 Jul 2015 11:53:26 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: 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

Re: [git-users] git cannot push

On Fri, 3 Jul 2015 06:58:17 -0700 (PDT) p...@greenlogix.eu wrote: but I cant acess any git-scm.com url since this morning, maybe it's down or something This book is called Pro Git. Google for it, and you'll find alternate sources (including paperback offers). still, I dont understand why a

Re: [git-users] git cannot push

On Fri, 3 Jul 2015 06:15:23 -0700 (PDT) p...@greenlogix.eu wrote: hello, I cloned a rep I installed on a ubuntu machine (empty rep) as I add files to that empty working copy, I can commit them (I use SourceTree) but once I do the push, I get an error, master - master (branch is

Re: [git-users] git cannot push

On Fri, 3 Jul 2015 07:33:59 -0700 (PDT) p...@greenlogix.eu wrote: [...] that's it, I am going back to subversion, I dont have a Phd nor a NASA ingeneer degree these are way to complicated for just 2 person working on a same project this is geberish, and I repeat, why so much hassel for a

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

On Wed, 1 Jul 2015 06:37:12 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: 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

Re: [git-users] Why commit --fixup uses commit message instead SHA of original commit in resulting commit message?

On Wed, 1 Jul 2015 00:32:23 -0700 (PDT) Igor Deyashkin igor.deyash...@gmail.com wrote: Let i have these commits: * task #2850 * task #2850 - #2961 Then i fixuping last commit: git commit --fixup= * bfbfbfbf fixup! task #2850 * task #2850 *

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

On Sat, 20 Jun 2015 10:07:17 +0200 Konrád Lőrinczi klorin...@gmail.com wrote: [...] As for the git sparse checkout it is a good idea, but I'm afraid, that if I ignore iscsi/nodes path, then this will be OK for Windows, but on Debian, in case of a data loss need of restore, these

Re: [git-users] Keeping history migrating .java to .scala

On Wed, 1 Jul 2015 07:49:45 -0700 (PDT) Oliver Schrenk oliver.schr...@gmail.com wrote: I want to migrate some legacy java code to scala whilst keeping git history intact for each file. The idea was to do a very basic conversion first, just doing ssyntactical changes first and have git mark it

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

On Wed, 24 Jun 2015 10:13:22 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: How to rebase the following commits? I have: A---B---C orig D---E---F dev [...] Does simple git rebase --root --onto orig dev work? I've just recreated such a history, and it works for me: foo% git

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

On Wed, 24 Jun 2015 11:06:52 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com 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---B---C orig \ E---F dev Still

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

On Wed, 24 Jun 2015 11:13:26 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: 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 Are there merges on dev? That is, what does

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

On Fri, 19 Jun 2015 21:08:00 +0200 Konrád Lőrinczi klorin...@gmail.com wrote: Thanks very much for your answer! It is really a deeply technical answer. Maybe are you one of developers of GIT? Thanks! No, I'm a mere enthusiast. [...] As for bare repo it doesn't make possible to edit under

Re: [git-users] Remote differs from local. Wrong push?

On Fri, 19 Jun 2015 03:51:46 -0700 (PDT) fs...@entornosdeformacion.com wrote: after a commit and push from my local branch to the remote one, I can see in the server (through the web page) that one of the committed files is broken. Differences shown in the commit are incompleted and the whole

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

On Fri, 19 Jun 2015 08:41:08 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: [...] But when I clone to a Windows machine I get the following error: [...] 'iscsi/nodes/iqn.1.com.microsoft:iscsiproxy-target': Invalid argument warning: Clone succeeded, but checkout failed. [...] I

Re: [git-users] Working Copy on remote not updating

On Tue, 16 Jun 2015 04:08:39 -0700 (PDT) Chad Baloga cbal...@gmail.com wrote: I am fairly new to GIT. Just Git or git. It's not an acronym ;-) When we do a push to the remote repo, the Working Copy on the remote does not get updated automatically. Do you mean the work tree? In other

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