On Sat, Jun 29, 2019 at 11:18:15PM -0600, Edmundo Carmona Antoranz wrote:
> Rebuash allows us to do squash/rebase without having to resort
> to use rebase.
>
> Consider the case where we have feature branches with merges in history:
>
> Rx: revisions in main branch
> Fx: Revisions in feature bra
On Sat, Jun 29, 2019 at 10:38:43AM -0600, Elijah Newren wrote:
> > - add a feature to fast-import to say "build on top of ref X", instead
> > of using to use rev-parse to manually generates a "reset" line
> > (maybe this is even possible already; I searched for it, but not
> > very h
On Sat, Jun 29, 2019 at 11:18 PM Edmundo Carmona Antoranz
wrote:
>
> ---
> wt-status.c | 49 +++--
> wt-status.h | 1 +
> 2 files changed, 44 insertions(+), 6 deletions(-)
>
I bet there are more things to do... like:
- what happens if the user runs gi
---
wt-status.c | 49 +++--
wt-status.h | 1 +
2 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index 0bccef542f..2a7627b331 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1118,11 +1118,24 @@ static void show_mer
Rebuash allows us to do squash/rebase without having to resort
to use rebase.
Consider the case where we have feature branches with merges in history:
Rx: revisions in main branch
Fx: Revisions in feature branch
Mx: Merge revisions (some of them with conflicts)
R1---R2---R3-
Hi,
I have a script which I have used for long time, with numerous
git commands and one of commands is this trivial:
git submodule foreach --recursive git clean -ffd
I updated to Git 2.22.0 and noticed Git started to complain:
```
$ cd /d/boost
$ git submodule foreach --recursive git clean -ffd
Hey Everyone!
Here[1] is an update of my past week.
Thanks
Rohit
[1]: https://rashiwal.me/2019/first-evaluation/
Ævar Arnfjörð Bjarmason wrote:
> I have the feedback I posted before this patch in
> https://public-inbox.org/git/874l4f8h4c@evledraar.gmail.com/
>
> In particular "b" there since "a" is clearly more work. I.e. shouldn't
> we at least in interactive mode on a "gc" print something about skippi
SZEDER Gábor wrote:
> On Fri, Jun 28, 2019 at 07:02:11AM +, Eric Wong wrote:
> > diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
> > index 86d05160a3..0acde3b1f8 100755
> > --- a/t/t7700-repack.sh
> > +++ b/t/t7700-repack.sh
> > @@ -239,4 +239,14 @@ test_expect_success 'bitmaps can be disab
On Tue, Jun 18, 2019 at 01:21:25PM -0700, Jeff Hostetler via GitGitGadget wrote:
> diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
> index 716283b274..febf63f28a 100755
> --- a/t/t6040-tracking-info.sh
> +++ b/t/t6040-tracking-info.sh
> @@ -159,6 +159,19 @@ test_expect_success 'sta
On Wed, Jun 12, 2019 at 06:29:37AM -0700, Derrick Stolee via GitGitGadget wrote:
> diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
> index e80c1cac02..3b6fd0d728 100755
> --- a/t/t5318-commit-graph.sh
> +++ b/t/t5318-commit-graph.sh
> @@ -23,6 +23,14 @@ test_expect_success 'write gra
On Thu, Jun 20, 2019 at 12:38:18PM -0400, Barret Rhoden wrote:
> diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
> new file mode 100755
> index ..844396615271
> --- /dev/null
> +++ b/t/t8014-blame-ignore-fuzzy.sh
> @@ -0,0 +1,440 @@
> +test_expect_success set
On Thu, Jun 27, 2019 at 09:46:51AM -0700, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> > However, we've always used the macOS build jobs as "build and test
> > with the latest and greatest", i.e. they install the latest available
> > Perforce and Git-LFS. To keep up with this tradition we'd
On Fri, Jun 28, 2019 at 6:32 PM Jeff King wrote:
>
> On Fri, Jun 28, 2019 at 02:53:26PM +0200, Johannes Schindelin wrote:
>
> > > > It would be nice if we had a "test_commits_bulk" that used fast-import
> > > > to create larger numbers of commits.
> > >
> > > So here's a patch to do that.
> >
> >
On 28/06/2019 20:11, Thomas Gummerer wrote:
On 06/26, Junio C Hamano wrote:
* ra/cherry-pick-revert-skip (2019-06-24) 6 commits
- cherry-pick/revert: advise using --skip
- cherry-pick/revert: add --skip option
- sequencer: use argv_array in reset_merge
- sequencer: rename reset_for_ro
Hi Rohit
On 23/06/2019 21:03, Rohit Ashiwal wrote:
In the case of merge conflicts, while performing a revert, we are
currently advised to use `git cherry-pick --`
of which --continue is incompatible for continuing the revert.
I'm not sure why this says we cannot use --continue with revert, I t
Hello Eugen,
If I do space changes to lines as next:
## Create radius account
eval{
my $radius_dbh = $self->result_source->storage->schema->{ _radius_dbh
};
$radius_dbh->begin_work;
my $sth = $radius_dbh->prepare(
"INSERT INTO radusergrou
Hello
I want to apply this patch from stage:
diff --git a/lib/App/Schema/Result/Invoice.pm b/lib/App/Schema/Result/Invoice.pm
index 0176916f..0ce2d698 100644
--- a/lib/App/Schema/Result/Invoice.pm
+++ b/lib/App/Schema/Result/Invoice.pm
@@ -219,14 +219,14 @@ sub new_package {
# my $package_ty
On Fri, Jun 28, 2019 at 07:46:02PM -0400, Eric Sunshine wrote:
> On Fri, Jun 28, 2019 at 7:04 PM SZEDER Gábor wrote:
> > On Fri, Jun 28, 2019 at 05:32:35PM -0400, Eric Sunshine wrote:
> > > On Fri, Jun 28, 2019 at 5:39 AM Jeff King wrote:
> > > > + in_dir=${indir:+-C "$indir"}
> > >
> > > D
On Fri, Jun 28, 2019 at 07:02:11AM +, Eric Wong wrote:
> Jeff King wrote:
> > On Sun, Jun 23, 2019 at 06:08:25PM +, Eric Wong wrote:
> >
> > > > I'm not sure of the right solution. For maximal backwards-compatibility,
> > > > the default for bitmaps could become "if not bare and if there
The 'add' subcommand is useless as it is mostly identical
to the 'put' subcommand, so let's remove it.
Helped-by: Derrick Stolee
Signed-off-by: Christian Couder
---
This and 2/2 follow this discussion about test coverage:
https://public-inbox.org/git/CAP8UFD3VFdCUwDBTb9en22FO7HnWc4vgQ4h0hhariC
Testing the 'remove' subcommand was forgotten when t0016
was created. Let's fix that.
Helped-by: Derrick Stolee
Signed-off-by: Christian Couder
---
t/t0016-oidmap.sh | 18 ++
1 file changed, 18 insertions(+)
diff --git a/t/t0016-oidmap.sh b/t/t0016-oidmap.sh
index af17264ce3..b
On Fri, Jun 28, 2019 at 09:22:56AM -0700, Junio C Hamano wrote:
> > argv_array_push(&rev_list.args, "--quiet");
> > + argv_array_push(&rev_list.args, "--alternate-refs");
> > if (opt->progress)
> > argv_array_pushf(&rev_list.args, "--progress=%s",
> >
On Fri, Jun 28, 2019 at 08:51:04AM -0400, Derrick Stolee wrote:
> On 6/28/2019 6:11 AM, Jeff King wrote:
> > When we receive a remote ref update to sha1 "X", we want to check that
> > we have all of the objects needed by "X". We can assume that our
> > repository is not currently corrupted, and th
24 matches
Mail list logo
