Re: [BUG?] worktree setup broken in subdirs with git alias

2016-01-07 Thread Duy Nguyen
On Thu, Jan 7, 2016 at 4:26 PM, Duy Nguyen wrote: > You forgot to mention what version you used. Gaaah i need to work on my reading skills. You did mention 'next' in >> sorry I can't dig deeper now, but the worktree code from next seems to So it matches my expectation. Merge

Re: Picking up old threads/patches

2016-01-07 Thread Jeff King
On Wed, Jan 06, 2016 at 08:59:52PM -0700, Stephen & Linda Smith wrote: > > If Will isn't interested in finishing these two patches I will pick them > > up [ ($gmane/271213), ($gmane/272180) ] > > > > After that I will check look at some of the others for which you've > > asked for help. > >

Re: Advice regarding inherited git repository

2016-01-07 Thread Danielle
> You probably should create a sandbox branch, for your own sanity. > Because git is distributed, each separate repository is implicitly a > branch. So if you did something like: > > 1. Commit all the changes on the main site to "master". Push the > result to some common remote. > > 2.

Re: [BUG?] worktree setup broken in subdirs with git alias

2016-01-07 Thread Michael J Gruber
Michael J Gruber venit, vidit, dixit 07.01.2016 10:40: > Duy Nguyen venit, vidit, dixit 07.01.2016 10:26: >> On Thu, Jan 7, 2016 at 2:15 PM, Michael J Gruber >> wrote: >>> Hi there, >>> >>> sorry I can't dig deeper now, but the worktree code from next seems to >>> get

Re: [PATCH v2 1/2] commit: allow editing the commit message even in shared repos

2016-01-07 Thread Jeff King
On Wed, Jan 06, 2016 at 02:09:43PM +0100, Johannes Schindelin wrote: > It was pointed out by Yaroslav Halchenko that the file containing the > commit message is writable only by the owner, which means that we have > to rewrite it from scratch in a shared repository. > [...] > diff --git

Re: [PATCH] interpret-trailers: add option for in-place editing

2016-01-07 Thread Tobias Klauser
On 2016-01-06 at 20:02:23 +0100, Eric Sunshine wrote: > On Wed, Jan 6, 2016 at 8:34 AM, Tobias Klauser > wrote: > > Add a command line option --in-place to support in-place editing akin to > > sed -i. This allows to write commands like the

Re: Picking up old threads/patches

2016-01-07 Thread Stephen & Linda Smith
On Thursday, January 07, 2016 03:03:50 AM Jeff King wrote: > If it's an ancient thread, it's not a big deal to just start a new > thread (especially if you reference the old one in the text so people > can dig it up if they really care). > > But for reference, you can add `/raw` to the end of a

git pull --rebase overwrites/deletes empty commits

2016-01-07 Thread Bastian Binder
Hello, I have recently encountered a probable bug in git. We have messages we want to appear in the log and do an empty commit: git commit --allow-empty -m "message we want to publish" After this commit, we do a fetch-rebase in order to pull the intermediate commits into the local branch before

Some issues when trying to set up a shallow git mirror server

2016-01-07 Thread Richard Maw
Hi all. I've been working on a service that mirrors open source code into git, (http://git.baserock.org/cgi-bin/cgit.cgi/?q=delta if interested). Some repositories are too unwieldy to mirror the whole history, so we're looking at shallow support, by fetching specified branches with `--depth=1`.