From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org
Subject: Re: git-mergetool to be used for rebases as well?
Date: Tue, 10 Jan 2017 12:26:47 -0800 [thread overview]
Message-ID: <xmqqvatmr794.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170110185421.2638-1-sbeller@google.com> (Stefan Beller's message of "Tue, 10 Jan 2017 10:54:21 -0800")
Stefan Beller <sbeller@google.com> writes:
> $ git status
> rebase in progress; onto ...
> You are currently rebasing branch '...' on '...'.
>
> Changes to be committed:
> modified: ...
>
> Unmerged paths:
> both modified: ...
>
> $ git mergetool
> No files need merging
> $ git diff <file name>
> diff --cc <file name>
> index ...
> --- a/file
> +++ b/file
> @@@ ...
> content
> ++<<<<<<< HEAD
> + content
> ++=======
> + content
> ++>>>>>>> other commit
> content
>
>
> The mergetool used to work apparently, but stopped for rebases.
> I noticed in neither t7610-mergetool.sh nor any rebase test the combination of
> rebase and mergetool is tested.
The above redacts too much to be useful for guessing, but are you by
any chance being hit by a recent regression, i.e. have rerere enabled
and running mergetool from a subdirectory?
See <20170109232941.43637-15-hansenr@google.com> (and previous
rounds).
prev parent reply other threads:[~2017-01-10 20:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 18:54 git-mergetool to be used for rebases as well? Stefan Beller
2017-01-10 20:26 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqvatmr794.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox