Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution
From: Jeff King <peff@xxxxxxxx>
Date: Thu, 26 Sep 2019 17:11:33 -0400
Cc: Johannes Schindelin <Johannes.Schindelin@xxxxxx>, git@xxxxxxxxxxxxxxx
In-reply-to: <CAA4phoF5xm=HuoAmor+dQEBqBJn_0thAT38ao8JtA6XhGCDQ6Q@mail.gmail.com>
References: <20190520120636.GA12634@sigill.intra.peff.net> <20190520121301.GD11212@sigill.intra.peff.net> <nycvar.QRO.7.76.6.1905230858570.46@tvgsbejvaqbjf.bet> <20190524063955.GD25694@sigill.intra.peff.net> <nycvar.QRO.7.76.6.1905281301070.44@tvgsbejvaqbjf.bet> <20190528213529.GG24650@sigill.intra.peff.net> <nycvar.QRO.7.76.6.1905291356240.44@tvgsbejvaqbjf.bet> <CAA4phoF5xm=HuoAmor+dQEBqBJn_0thAT38ao8JtA6XhGCDQ6Q@mail.gmail.com>

On Thu, Sep 26, 2019 at 04:20:05PM +0200, Alejandro Sanchez wrote:

> Are there any updates to this problem?

The fix for the original bug went into Git v2.22.1.

-Peff

References:
- [PATCH 0/4] fix BUG() with "git am -i --resolved"
  - From: Jeff King
- [PATCH 4/4] am: fix --interactive HEAD tree resolution
  - From: Jeff King
- Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution
  - From: Johannes Schindelin
- Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution
  - From: Jeff King
- Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution
  - From: Johannes Schindelin
- Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution
  - From: Jeff King
- Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution
  - From: Johannes Schindelin
- Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution
  - From: Alejandro Sanchez

Prev by Date: Re: [PATCH 1/1] git gui: fix staging a second line to a 1-line file
Next by Date: Re: git-gui: disable the "loose objects popup" dialog?
Previous by thread: Re: [PATCH 4/4] am: fix --interactive HEAD tree resolution
Next by thread: Draft of Git Rev News edition 51
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]