On 16.06.2015 03:17, Eric Raible wrote:
So naturally I want to check each of them for correctness.
Sorry for joining this thread so late, I only come to know about it from the
draft of the upcoming Git Rev News 5 [1].
A while ago Robin Green was asking a very similar question on StackOverflow
Junio C Hamano venit, vidit, dixit 18.06.2015 17:57:
Michael J Gruber g...@drmicha.warpmail.net writes:
This type of request comes up often (for a reason). I'm wondering
whether we could support it more systematically, either by exposing the
steps above as a command, or by storing the
Michael J Gruber g...@drmicha.warpmail.net writes:
Junio C Hamano venit, vidit, dixit 18.06.2015 17:57:
Perhaps 'tr/remerge-diff' (on 'pu') is of interest?
I haven't reviewed remerge-diff but merged it on top of my own local
additions and ran the full test suite successfully. Any big
Johannes Schindelin venit, vidit, dixit 16.06.2015 11:43:
Hi Eric,
On 2015-06-16 03:17, Eric Raible wrote:
I'm running 1.9.5.msysgit.1, but this is a general git question...
Upon returning from a vacation, I was looking at what people had been
up to, and discovered on merge in which a
Hi Micha,
On 2015-06-18 14:26, Michael J Gruber wrote:
Johannes Schindelin venit, vidit, dixit 16.06.2015 11:43:
To list all the merge commits in the current branch, I would use the
command-line:
```bash
git rev-list --author=My Colleague --parents HEAD |
sed -n 's/ .* .*//p'
```
Michael J Gruber g...@drmicha.warpmail.net writes:
This type of request comes up often (for a reason). I'm wondering
whether we could support it more systematically, either by exposing the
steps above as a command, or by storing the unresolved merge somewhere
(leveraging stash or rerere).
On 6/16/2015 2:43 AM, Johannes Schindelin wrote:
Hi Eric,
On 2015-06-16 03:17, Eric Raible wrote:
I'm running 1.9.5.msysgit.1, but this is a general git question...
Upon returning from a vacation, I was looking at what people had been
up to, and discovered on merge in which a colleague
Hi Eric,
On 2015-06-16 03:17, Eric Raible wrote:
I'm running 1.9.5.msysgit.1, but this is a general git question...
Upon returning from a vacation, I was looking at what people had been
up to, and discovered on merge in which a colleague had resolved a merge
incorrectly. It turns out that
8 matches
Mail list logo
