[git-users] Re: Is this a bug in ls-files regarding worktree?

2012-06-18 Thread nrk
> > git --work-tree=/Users/tfnico. ls-files > That's interesting. So, I tried changing core.worktree = /Users/nick.(appending the extra period). Now I get $ git status fatal: This operation must be run in a work tree > By the way, not sure why you first initialize the repo as bare, and the

Re: [git-users] How to make a new branch with a portion of a branch?

2012-06-18 Thread EricP
Hi all, thanks for all you clever replies. Here's what I've done: $ git branch 2.2 tag2.1 $ git checkout 2.2 $ git merge 2.1 $ git checkout 2.1 $ git revert --no-commit > On Sun, 17 Jun 2012 09:12:26 -0400 > Eric Parent wrote: > > >I've been working on a branch, say '2.1' and made a few c

Re: [git-users] How to make a new branch with a portion of a branch?

2012-06-18 Thread Konstantin Khomoutov
On Sun, 17 Jun 2012 09:12:26 -0400 Eric Parent wrote: >I've been working on a branch, say '2.1' and made a few commits on > it. We've made a release and tagged the changeset at which the commit > was produced, say 'tag2.1'. > >Development continued and a few more commits were made on tha

[git-users] Re: Is this a bug in ls-files regarding worktree?

2012-06-18 Thread Thomas Ferris Nicolaisen
Interesting approach. And I am seeing the same "bug" as you are. I had a quick look at the docs but couldn't find any mention of special handling of ~, or why it doesn't work with that absolute path.. I did notice that if you configure it with git config co

[git-users] Is this a bug in ls-files regarding worktree?

2012-06-18 Thread nrk
I set up a system to keep track of my dotfiles in my home directory as follows: $ mkdir dotfiles.git $ cd dotfiles.git $ git init --bare >From here I edited dotfiles.git/config to read [core] repositoryformatversion = 0 filemode = true bare = false ignorecase = true worktree = /Users/nick I al

[git-users] Re: How to make a new branch with a portion of a branch?

2012-06-18 Thread Thomas Ferris Nicolaisen
On Monday, June 18, 2012 3:25:15 PM UTC+2, EricP wrote: > > Now, see if this repo is consistent when pulling from it... But seems like > there is something wrong > $ cd .. > $ mkdir tata > $ cd tata > $ git clone ../momo > Cloning into 'momo'... > done. > warning: remote HEAD refers to nonexistent

[git-users] Re: How to make a new branch with a portion of a branch?

2012-06-18 Thread EricP
Hi Daniel, I tried the following: Le lundi 18 juin 2012 01:55:06 UTC-4, Daniel Dotsenko a écrit : > > // truncate 2.1 > git co 2.1 > git br 2.2// 2.2 will retain all commits you reset below > git reset tag2.1 --hard > > // revert selected commits in what will be 2.2 > git co 2.2 > > Omitted t