Re: [git-users] moving a directory from one repo to another with commit history

On Sat, 23 May 2015 23:02:46 +0530 Kalpa Welivitigoda wrote: [...] > >> Use the `git subtree` command [*]. > > [...] > > > > To elaborate, a pseudocode (assuming a POSIX shell) is something > > like this: > > > > $ cd repoB > > $ git tag Bdir12 $(git subtree split dir1-2) > > > > $ cd ../re

Re: [git-users] Need some advice on git setup -- development files must be run on the server

On Mon, 25 May 2015 09:30:17 -0700 (PDT) Chris Fillmore wrote: [...] > In order to test our changes, the code MUST be > running on the server -- it can't be run locally on our machines. The > server in our office is not a production environment, it's a > development environment. Testing and produ

Re: [git-users] Git http-backend shouldn't use Webdav

On Mon, 25 May 2015 13:44:49 -0700 (PDT) Matthias Lantsch wrote: > Hello community I have a problem with the "new" http-backend of git. > I have set up the git-http-backend to use the "smart" http version of > git. Authentification works fine, I can clone my repository over http > and https as ex

Re: [git-users] Git http-backend shouldn't use Webdav

On Mon, 25 May 2015 13:44:49 -0700 (PDT) Matthias Lantsch wrote: [...] > But when I am trying to push, I get a 404 header back and a return > code 22: > > PROPFIND /git/repo/test.git/ HTTP/1.1 JFTR: The server's part -- maps requests and URIs to actions: $ git grep -E 'GET|POST|PROP' v1.9.5 --

Re: [git-users] moving a directory from one repo to another with commit history

On Tue, 26 May 2015 22:24:25 +0530 Kalpa Welivitigoda wrote: [...] > >> Thanks for all the support rendered. I tried the above method and > >> it places the directory from repoB to the correct place on repoA. > >> But if I log the commits for dir1-2 in repoA (git log > >> dir1/dir1-2), it shows o

Re: [git-users] moving a directory from one repo to another with commit history

On Tue, 26 May 2015 23:43:43 +0530 Kalpa Welivitigoda wrote: [...] > >> Following is the output of $ git log --all --graph --decorate > >> --oneline > >> > >> * 9c97cd4 (HEAD, master) Merge tag 'tags/Bdir12' > >> |\ > >> | * af56821 (tag: Bdir12) updating dir1-2 > >> | * d0b8f8a adding dir1-2 >

Re: [git-users] GIT_DIR missing in pre-rebase hook

On Tue, 26 May 2015 08:14:28 -0700 (PDT) Nick Kugaevsky wrote: > It was really suprising when I find out that GIT_DIR variable is > missing in some hooks. > > I want to run hook before executing `git pull --rebase` command, so I > use `pre-rebase` hook for that. There is GIT_DIR variable in my >

Re: [git-users] How to ignore the file size ??

On Fri, 29 May 2015 03:00:55 -0700 (PDT) thomas.bergjuer...@googlemail.com wrote: > I want to use git for my cisco config backupdir. In the config files, > there a autogenerated lines with current username and timestamps. To > ignore these lines, I generated a filter. > > snip

Re: [git-users] Some clarification on what Git is actually doing, please

On Sat, 30 May 2015 10:53:47 -0700 (PDT) Tim Dawson wrote: > I'm fairly new to Git. I've learned how to commit, branch etc. > > I'm working on a web site which has problems with cross-browser > compatibility. > > I have created a branch called 'no-flex' in which I've created new > files to try

Re: [git-users] Some clarification on what Git is actually doing, please

On Tue, 2 Jun 2015 09:32:35 +0200 Magnus Therning wrote: > > That's quite a lot to take in with one read-through, so I'll study > > it more carefully as I go forward. > > I'm finding Git a whole lot better than giving files slightly > > different names and trying to remember which one went with a

Re: [git-users] branching in a distributed environment

On Tue, 2 Jun 2015 15:37:33 +0200 Magnus Therning wrote: [...] > at the next `git fetch` people will see that branch locally and they > can check it out using > > % git checkout -b temporary origin/temporary [...] As a useful shortcut, these days git checkout origin/temporary will creat

Re: [git-users] branching in a distributed environment

On Tue, 2 Jun 2015 16:08:24 +0200 Magnus Therning wrote: > > [...] > >> at the next `git fetch` people will see that branch locally and > >> they can check it out using > >> > >> % git checkout -b temporary origin/temporary > > [...] > > > > As a useful shortcut, these days > > > > git chec

Re: [git-users] Deploying a static website to local and production servers

On Tue, 2 Jun 2015 07:26:54 -0700 (PDT) Márcio Moreira wrote: > We are using Pelican, a static site generator, to generate our web > site. We write markdown formatted text files to a "content" folder > and Pelican generates HTML files to an "output" folder. > > Our goal is that the site could b

Re: [git-users] Deploying a static website to local and production servers

On Tue, 2 Jun 2015 18:09:52 +0300 Konstantin Khomoutov wrote: (Cc'd Nick, who recently asked a question about GIT_DIR.) [...] > But that's not required for having your files checked out. 90% of > random HOWTOs you're able to google using "git+web+deployment"

Re: [git-users] Avoid EOL hell

On Tue, 2 Jun 2015 22:09:46 +0530 Rustom Mody wrote: > Setting up for a project in which both linux and windows will be the > OSes. > > After spending some time searching for solutions I am as confused as > ever. What are the optimum crlf settings so that files (maybe of > designated types, say

Re: [git-users] Deploying a static website to local and production servers

On Tue, 2 Jun 2015 18:09:25 -0700 (PDT) Márcio Moreira wrote: > I am sorry I forgot to say previously that Pelican runs on the > collaborators laptops. The versioned folder already includes source, > output, and other sub-folders and files. The workflow: our > collaborator will edit the source

Re: [git-users] Stash date time

On Wed, 3 Jun 2015 16:29:27 +0200 Magnus Therning wrote: > > I've a little request for you. > > What about saving date-time on git stash save command and show it > > on git stash show stash@{xxx}? > > I think it is a useful poperty to save. > > > > What do you think about it? > > This is a users

Re: [git-users] Change directory of git repository

On Tue, 9 Jun 2015 09:43:57 -0700 (PDT) Hannah Scheibner wrote: > There must be some quick fix but I just can't figure out how to do it: > > I initialized a git repository on my local computer, but > unfortunately at the wrong place, i.e. in the wrong directory. > How can I undo this or move th

Re: [git-users] Problem with the detached head:

On Wed, 10 Jun 2015 08:28:19 -0700 (PDT) Bhargavi V wrote: > I have the head detached for my remote origin/develop branch. Terminology warning: the HEAD being in a detached state precisely means that it's no longer associated with any branch -- that's why it's detached after all. So you can't r

Re: [git-users] Setting up Git for existing project

On Wed, 10 Jun 2015 09:29:04 -0700 (PDT) David VanKirk wrote: [...] > That being said, I'm not sure the best practice for getting our > existing code into Git. We currently have a Test server and > Production server, so we have two copies of the code and the > developers access the code directly

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 wh

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 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 understand, that Window

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

On Tue, 16 Jun 2015 04:08:39 -0700 (PDT) Chad Baloga 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 words, do you mean t

Re: [git-users] Re: git-http-backend on apache for public pull and private push?

On Wed, 17 Jun 2015 14:27:48 -0700 (PDT) tobias zellner wrote: [...] > > But now, something strange happen. I have following behavior: > > > >1. pull work fine for everybody. > >2. push work for everybody. No credentials are asked. > > > > So now I have a repository that is not protected

Re: [git-users] Git Replacing Directory Delimiter (Forward Slash) With Colon

On Mon, 15 Jun 2015 07:05:38 -0700 (PDT) Steve Penza wrote: > When using Windows to clone a GIT repository, several files in one > directory are listed with a colon in the file name instead of the > directory delimiter: a forward slash. The files cannot be created in > Windows and they are autom

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 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 Windows, then > c

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

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 git rebase --root --onto orig dev work? I've just recreated such a history, and it works for me: foo% git slog orig 272fe

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

On Wed, 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---B---C orig > \ > E---F dev > Still missing the "D

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

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 log dev --oneline > 4f9a02e F > 69eabea E > dbdf75f D Are there merges on dev? That is, what does git log --g

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

On Wed, 1 Jul 2015 07:49:45 -0700 (PDT) Oliver Schrenk 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 only as a rename and

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

On Wed, 1 Jul 2015 06:37:12 -0700 (PDT) Konrád Lőrinczi 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 conflict in case

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 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 > * 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 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 files will

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 (branc

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 wh

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 fo

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

On Mon, 6 Jul 2015 11:53:26 -0700 (PDT) Konrád Lőrinczi 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 of a softwa

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

On Tue, 7 Jul 2015 06:28:49 -0700 (PDT) agnes monest 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 > become an admin or

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

On Mon, 20 Jul 2015 10:43:14 -0700 (PDT) Thomas de Rivaz 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 message because you ar

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

On Mon, 20 Jul 2015 06:50:02 -0700 (PDT) Dimitris Papageorgiou 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 aforementionedC:\Apache24\htdocs\Appointments

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 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 a fetch

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

On Tue, 21 Jul 2015 13:22:56 -0500 John McKown 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 > monthly, go a git gc --aggressiv

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

On Tue, 21 Jul 2015 12:37:20 -0700 (PDT) Dimitris Papageorgiou 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 the message

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

On Tue, 21 Jul 2015 20:04:08 -0700 (PDT) RK wrote: > We are using git 1.8.3.1 on AIX 6.1 server. Recently AIX patches > applied on the AIX box and git stopped working. git is failing to > extract the code. > > Error attached . The error is mentioned below in blue color. > > >

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

On Tue, 21 Jul 2015 23:00:23 -0700 (PDT) dexter ietf 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 > - create

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

On Wed, 22 Jul 2015 06:48:06 -0500 John McKown 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 monthly, go a gi

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: > http://www-03.ibm.co

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

On Wed, 22 Jul 2015 07:41:19 -0500 John McKown wrote: [...] > >> http://www-03.ibm.com/systems/power/software/aix/linux/toolbox/alpha.html#G > >> for AIX. > >> > > > > Unfortunately, that's not it. The package is called "git" but it's > > not Git-the-SCM. > > > > I wonder what it is. As I under

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 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 show replaced

Re: [git-users] bare repository checkout

On Thu, 23 Jul 2015 00:54:32 -0700 (PDT) dexter ietf wrote: > bare repository only contains the meta data, but when i clone from a > bare-repo > full tree will be checked out. how does git manage to achieve that. i > know it's > a newbie question. but surprised by the fact that git can do that.

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 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 statement. So, to be

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 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 > > ask you

Re: [git-users] Visually show file history

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

Re: [git-users] Visually show file history

On Tue, 28 Jul 2015 13:30:56 -0700 Ying Huang wrote: > Hi, I am trying to visually show a file change history. > I have a file, named hello.txt, and 3 commits on it, they are: > > _ 1b0e691e55caa8fd2b5dd6902f77c406fb68e648__ > __ d058c095f7e98a7ebe943c18f87ef087c723bb9f__ > __ c4d1769183ab6d

Re: [git-users] Visually show file history

On Wed, 29 Jul 2015 07:48:10 -0700 Ying Huang 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 >git di

Re: [git-users] Visually show file history

On Wed, 29 Jul 2015 08:26:23 -0700 Ying Huang 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 > > those commit

Re: [git-users] Visually show file history

On Wed, 29 Jul 2015 16:57:30 -0700 Ying Huang 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] 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] 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 can't > push it to the

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 was very happy to see th

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 > am converting it to he

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 > the local branch. I thoug

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 '23784' > needs to be authent

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)), function > uri_skip_ancestor, file

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 w

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 inclined to think all of th

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 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, on POSIX systems, > tar

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] 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 on that branch (relative

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 for '': > Counting objects:

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 > > style.css will be listed there (in th

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 type ls > > > > > > style

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 so-called "Git for Win

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 people on a common pr

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* > \Desktop\Projects but it still

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 > to get rid of my

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 seems to launch it as no

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], you'll be able to compa

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 moot term at best but i

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 this message because

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 my changes for review.. >

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 ..." > while executing > ".bar.v

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?: > - Move current files in

Re: [git-users] Apply the patch/diff of a stash as a patch?

On Fri, 2 Oct 2015 11:37:48 -0700 Michael wrote: > Is there a way in git to apply the _DIFF_ of a commit as a patch? Try $ git diff stash@{0}^1 stash@{0} | git apply The basic idea behind this is that a stash entry is a commit containing the state of the files in the work tree, which has two

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 > MadCap Flare already p

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 of any distributed version c

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 Konstantin was only comment

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] 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 > PATH doesnt work. It

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 it from? Did you tweak

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 there is that you can'

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 you

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 And another point of intere

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 prior experience with

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 it's done by passing

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 password again and again? can I a

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 > > I am running bower insta

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 for it. Can anyone provide

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. [...] > Now, I am searching f

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 push the > message itself to t

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