Hi Junio,
On 2015-04-20 21:28, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> This is primarily note-to-self; even though I haven't got around
>> bisecting yet, I think I know I did some bad change myself.
>>
>> "git pull $URL $tag" seems to:
>>
>> * fail to invoke the editor without "--ed
Junio C Hamano writes:
> This is primarily note-to-self; even though I haven't got around
> bisecting yet, I think I know I did some bad change myself.
>
> "git pull $URL $tag" seems to:
>
> * fail to invoke the editor without "--edit".
> * show the summary merge log message twice.
We seem to
Jeff King writes:
> On Mon, Apr 20, 2015 at 11:59:04AM -0700, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> > @@ -334,7 +333,7 @@ true)
>> >eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash
>> > $no_ff $ff_only"
>> >eval="$eval $log_arg $strategy_args $merge_ar
On Mon, Apr 20, 2015 at 11:59:04AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > @@ -334,7 +333,7 @@ true)
> > eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash
> > $no_ff $ff_only"
> > eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress"
>
Jeff King writes:
> @@ -334,7 +333,7 @@ true)
> eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash
> $no_ff $ff_only"
> eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress"
> eval="$eval $gpg_sign_args"
> - eval="$eval -m \"\$merge_name\"
On Sun, Apr 19, 2015 at 05:38:26PM +, brian m. carlson wrote:
> > eval="git-rebase $diffstat $strategy_args $merge_args $rebase_args
> > $verbosity"
> > @@ -334,7 +333,7 @@ true)
> > eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash
> > $no_ff $ff_only"
> > ev
On Sun, Apr 19, 2015 at 09:07:46AM -0400, Jeff King wrote:
> Which I guess is just:
>
> diff --git a/git-pull.sh b/git-pull.sh
> index 252969e..15d9431 100755
> --- a/git-pull.sh
> +++ b/git-pull.sh
> @@ -323,7 +323,6 @@ then
> fi
> fi
>
> -merge_name=$(git fmt-merge-msg $log_arg <"$GIT_D
On Sat, Apr 18, 2015 at 06:39:20PM -0700, Junio C Hamano wrote:
> This is primarily note-to-self; even though I haven't got around
> bisecting yet, I think I know I did some bad change myself.
>
> "git pull $URL $tag" seems to:
>
> * fail to invoke the editor without "--edit".
> * show the sum
This is primarily note-to-self; even though I haven't got around
bisecting yet, I think I know I did some bad change myself.
"git pull $URL $tag" seems to:
* fail to invoke the editor without "--edit".
* show the summary merge log message twice.
--
To unsubscribe from this list: send the line
9 matches
Mail list logo