Re: [PATCH v4] gc: reject if another gc is running, unless --force is given

2013-08-09 Thread Andres Perera
On Thu, Aug 8, 2013 at 6:35 AM, Nguyễn Thái Ngọc Duy wrote: > This may happen when `git gc --auto` is run automatically, then the > user, to avoid wait time, switches to a new terminal, keeps working > and `git gc --auto` is started again because the first gc instance has > not clean up the reposi

Re: [PATCH] pull: Allow pull to preserve merges when rebasing.

2013-08-11 Thread Andres Perera
hello, comments inline On Sun, Aug 11, 2013 at 4:56 PM, Stephen Haberman wrote: > If a user is working on master, and has merged in their feature branch, but > now > has to "git pull" because master moved, with pull.rebase their feature branch > will be flattened into master. > > This is because

Re: [PATCH] pull: Allow pull to preserve merges when rebasing.

2013-08-11 Thread Andres Perera
On Sun, Aug 11, 2013 at 6:39 PM, Stephen Haberman wrote: > >> 1. i'm not sure why you are testing $3 == preserve. it looks like a >> typo > > Yes, good catch. I've added a test that fails, and will fix that. > >> 2. clearer than a string of yoda conditions: >> >> case $2 in >> true|false|preserve)

Re: ephemeral-branches instead of detached-head?

2013-08-14 Thread Andres Perera
On Wed, Aug 14, 2013 at 2:02 AM, Sitaram Chamarty wrote: > On 08/14/2013 07:14 AM, Junio C Hamano wrote: >> Sitaram Chamarty writes: >> >>> # all reflog entries that are not on a branch, tag, or remote >>> d1 = !gitk --date-order $(git log -g --pretty=%H) --not --branches >>> --tags --re

Re: ephemeral-branches instead of detached-head?

2013-08-14 Thread Andres Perera
On Wed, Aug 14, 2013 at 4:35 AM, Sitaram Chamarty wrote: > On 08/14/2013 12:40 PM, Andres Perera wrote: >> On Wed, Aug 14, 2013 at 2:02 AM, Sitaram Chamarty wrote: >>> On 08/14/2013 07:14 AM, Junio C Hamano wrote: >>>> Sitaram Chamarty writes: >>>> >