Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

2016-08-04 Thread Junio C Hamano
Johannes Schindelin writes: >> > Something like this will make the test more consistent with the rest of >> > the file: >> > >> > diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh >> > index 5f29664..e5bbbd8 100755 >> > --- a/t/t5533-push-cas.sh >> > +++ b/t/t5533-push-cas.sh >> > @@ -220,7

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

2016-08-04 Thread Johannes Schindelin
Hi Lars & John, On Thu, 4 Aug 2016, Lars Schneider wrote: > > On 04 Aug 2016, at 13:32, John Keeping wrote: > > > > On Thu, Aug 04, 2016 at 10:03:39AM +0200, Lars Schneider wrote: > >> > >>> * jk/push-force-with-lease-creation (2016-07-26) 3 commits > >>> - push: allow pushing new branches wit

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

2016-08-04 Thread Lars Schneider
> On 04 Aug 2016, at 13:32, John Keeping wrote: > > On Thu, Aug 04, 2016 at 10:03:39AM +0200, Lars Schneider wrote: >> >>> >>> * jk/push-force-with-lease-creation (2016-07-26) 3 commits >>> - push: allow pushing new branches with --force-with-lease >>> - push: add shorthand for --force-with-le

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

2016-08-04 Thread John Keeping
On Thu, Aug 04, 2016 at 10:03:39AM +0200, Lars Schneider wrote: > > > > > * jk/push-force-with-lease-creation (2016-07-26) 3 commits > > - push: allow pushing new branches with --force-with-lease > > - push: add shorthand for --force-with-lease branch creation > > - Documentation/git-push: fix pl

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

2016-08-04 Thread Lars Schneider
> > * jk/push-force-with-lease-creation (2016-07-26) 3 commits > - push: allow pushing new branches with --force-with-lease > - push: add shorthand for --force-with-lease branch creation > - Documentation/git-push: fix placeholder formatting > > "git push --force-with-lease" already had enough l

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

2016-08-03 Thread Junio C Hamano
On Wed, Aug 3, 2016 at 5:24 AM, Jakub Narębski wrote:> > Could you apply the first part (the first patch) of the series, > namely: > >- clarify %f documentation Thanks. That's a good idea. > P.S. I guess that filter..process series is considered > pre-cooking? Yes. I've been waiting to

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

2016-08-03 Thread Jakub Narębski
W dniu 03.08.2016 o 00:24, Junio C Hamano pisze: > -- > [Stalled] > > * jh/clean-smudge-annex (2016-08-01) 9 commits > - use smudgeToFile filter in recursive merge > - use smudgeToFile filter in git am > - better recovery from failure of smudgeTo

What's cooking in git.git (Aug 2016, #01; Tue, 2)

2016-08-02 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. On the 'master' front, the individ