On 24/07/17 21:53, Junio C Hamano wrote:
Phillip Wood writes:
git rebase --continue requiring one to git add first confuses/annoys me
too. I started a patch to autostage unstaged changes if they don't
contain conflict markers a couple of weeks ago, I'll clean it up and
post it later this week.
Phillip Wood writes:
> git rebase --continue requiring one to git add first confuses/annoys me
> too. I started a patch to autostage unstaged changes if they don't
> contain conflict markers a couple of weeks ago, I'll clean it up and
> post it later this week.
As long as "git rebase" will keep
On 16/07/17 12:39, Philip Oakley wrote:
>
> From: "Junio C Hamano"
> Sent: Wednesday, July 12, 2017 10:29 PM
>> William Duclot writes:
>>
- The original said "When you have resolved this problem", without
giving a guidance how to resolve, and without saying what the
problem
From: "Junio C Hamano"
Sent: Wednesday, July 12, 2017 10:29 PM
William Duclot writes:
- The original said "When you have resolved this problem", without
giving a guidance how to resolve, and without saying what the
problem is. The updated one says "conflict" to clarify the
"problem
William Duclot writes:
>> - The original said "When you have resolved this problem", without
>>giving a guidance how to resolve, and without saying what the
>>problem is. The updated one says "conflict" to clarify the
>>"problem", and suggests "git add" as the tool to use after a
>>
Junio C Hamano writes:
> William Duclot writes:
>
> > diff --git a/git-rebase.sh b/git-rebase.sh
> > index 2cf73b88e..50457f687 100755
> > --- a/git-rebase.sh
> > +++ b/git-rebase.sh
> > @@ -55,9 +55,10 @@ LF='
> > '
> > ok_to_skip_pre_rebase=
> > resolvemsg="
> > -$(gettext 'When you have res
William Duclot writes:
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 2cf73b88e..50457f687 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -55,9 +55,10 @@ LF='
> '
> ok_to_skip_pre_rebase=
> resolvemsg="
> -$(gettext 'When you have resolved this problem, run "git rebase --continu
The git UI can be improved by addressing the error messages to those
they help: inexperienced and casual git users. To this intent, it is
helpful to make sure the terms used in those messages can be understood
by this segment of users, and that they guide them to resolve the
problem.
In particular
8 matches
Mail list logo