[git-users] issue with git-lfs

2018-06-26 Thread Pablo Rodríguez
Dear list, I started using git-lfs three days ago. I used it for a couple of repositories in “GitLab”. I only used "git lfs track '*-presentation.swf'" and "git add .gitattributes". It worked fine in both repos, although I experienced being asked for my username (when the repo url contains it [h

[git-users] merge conflicts

2017-04-03 Thread Pablo Rodríguez
Dear list, although I have been using git for almost three years, I have used it only for my writings (I cannot code). This reduces the need for branches and the possibility of merge conflicts. I experienced less than five, due to the fact of working in different computers (and having forgotten t

Re: [git-users] fetched to wrong branch

2016-12-22 Thread Pablo Rodríguez
On 12/20/2016 08:04 AM, Konstantin Khomoutov wrote: > 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 t

Re: [git-users] fetched to wrong branch

2016-12-22 Thread Pablo Rodríguez
On 12/19/2016 06:04 PM, John McKown wrote: > On Mon, Dec 19, 2016 at 10:43 AM, Pablo Rodríguez wrote: > [...] > I wanted to pull from my gh-pages remote branch (with "git pull origin > gh-pages"). I was about to commit on the master branch and I realized I >

[git-users] fetched to wrong branch

2016-12-19 Thread Pablo Rodríguez
Dear list, 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 was about to commit on the master branch and I realized I had no local gh-

[git-users] cannot commit to my local repo

2016-11-05 Thread Pablo Rodríguez
Dear list, I cannot commit to a repo of mine. I get the following error after saving message text in editor (with "git commit -p") error: Unable to append to .git/logs/refs/heads/master: Permission denied fatal: Cannot update the ref 'HEAD'. I thought I mistakenly commited a change

Re: [git-users] undoing git init?

2016-08-15 Thread Pablo Rodríguez
On 08/15/2016 10:58 AM, Magnus Therning wrote: > Pablo Rodríguez writes: > >> Dear list, >> >> I wanted to initialize a git repo in a directory, but I mistakenly >> reinitialized an existing repo in another directory. >> >> Two basic questions: >>

Re: [git-users] undoing git init?

2016-08-15 Thread Pablo Rodríguez
On 08/13/2016 08:47 AM, Gabby Romano wrote: > The parent git repo didn't recognise the action you did there? If it > did, you may try working with tour try to recover the files.in > general,redoing git init is deleting the .git folder... Hi Gabby, after practising with a brand new repository, I r

[git-users] undoing git init?

2016-08-12 Thread Pablo Rodríguez
Dear list, I wanted to initialize a git repo in a directory, but I mistakenly reinitialized an existing repo in another directory. Two basic questions: - How can I undo this? (All files from this repo have been removed [as anyone should expect].) - If there were some uncommited modifications in

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

2016-08-12 Thread Pablo Rodríguez
On 08/12/2016 06:16 PM, Konstantin Khomoutov wrote: > On Fri, 12 Aug 2016 17:50:12 +0200 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.

[git-users] changing email in one repo

2016-08-12 Thread Pablo Rodríguez
Dear list, 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 replace all email addresses in both my local repo and the remote? Many

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

2016-08-12 Thread Pablo Rodríguez
Dear list, 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 old-draft.tex`. The new book will have also a `my-book.tex` file. The file has been

Re: [git-users] New to Git. Really confused.

2016-04-10 Thread Pablo Rodríguez
On 04/10/2016 08:48 AM, Adam S wrote: > Hi all, > > I'm new to git and really confused. Hi Sebastian, as an average computer user that cannot code (my background isn’t technical, but in humanities), I can assure you that learning git is easy. Just in case you wonder, I use git for my texts or o

Re: [git-users] dropped stash without applying

2016-03-13 Thread Pablo Rodríguez
On 03/11/2016 03:42 PM, Konstantin Khomoutov wrote: > On Thu, 10 Mar 2016 21:56:07 +0100 Pablo Rodríguez wrote: > [...] >> As far as I know, all my repos are normal. I don’t know how to get >> non-bare repositories (no idea of what these might be). > [...] > > A bare

Re: [git-users] stash for remote?

2016-03-13 Thread Pablo Rodríguez
On 03/11/2016 12:06 PM, Konstantin Khomoutov wrote: > On Thu, 10 Mar 2016 23:27:01 +0100 Pablo Rodríguez wrote: > [...] > I'd honestly recommend you to read a book on Git: it helps to have a > clear vision of what a tool can do for you, so, when confronting with a > pro

Re: [git-users] stash for remote?

2016-03-10 Thread Pablo Rodríguez
On 02/29/2016 12:44 PM, Konstantin Khomoutov wrote: > On Mon, 29 Feb 2016 00:29:07 +0100 Pablo Rodríguez wrote: > >> is there any way to stash already commited local changes against the >> published version in the remote server? > > No, but why would you want to? Ma

Re: [git-users] dropped stash without applying

2016-03-10 Thread Pablo Rodríguez
On 01/26/2016 09:42 AM, Konstantin Khomoutov wrote: > On Tue, 26 Jan 2016 06:56:27 +0100 Pablo Rodríguez wrote: > >> I’m a git newbie and I wanted to stash a git repository containing >> text files. There were some uncommited changes in some files. >> >> I sta

[git-users] stash for remote?

2016-02-28 Thread Pablo Rodríguez
Dear list, is there any way to stash already commited local changes against the published version in the remote server? Many thanks for your help, Pablo -- http://www.ousia.tk -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubs

[git-users] dropped stash without applying

2016-01-25 Thread Pablo Rodríguez
Dear list, I’m a git newbie and I wanted to stash a git repository containing text files. There were some uncommited changes in some files. I stashed with "git stash". I corrected the two typos, committed with "git commit -p" and pushed changes to GitHub with "git push origin master". Since thi