'[Webkit-unassigned] [Bug 235861] git-webkit should allow rebasing to master without committing or st'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-unassigned
Subject:    [Webkit-unassigned] [Bug 235861] git-webkit should allow rebasing to master without committing or st
From:       bugzilla-daemon () webkit ! org
Date:       2022-01-31 23:45:59
Message-ID: bug-235861-2851-dHPdZotZ6v () https ! bugs ! webkit ! org/
[Download RAW message or body]

--1643672759.ac38A3.30558
Date: Mon, 31 Jan 2022 15:45:59 -0800
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: https://bugs.webkit.org/
Auto-Submitted: auto-generated

https://bugs.webkit.org/show_bug.cgi?id=235861

--- Comment #3 from Jonathan Bedard <jbedard@apple.com> ---
(In reply to Ryosuke Niwa from comment #2)
> (In reply to Jonathan Bedard from comment #1)
> > The implementation that first came to my mind would be controversial because
> > it wouldn't work well from a branch, but turns out that `git pull` has an
> > `--autostash` option, which should do what you're asking.
> 
> oh, that's neat. so that'll stash, pull, then stash apply?

Looks like it creates a temporary stash commit to be compatible with --rebase, but \
basically yes.

-- 
You are receiving this mail because:
You are the assignee for the bug.
--1643672759.ac38A3.30558
Date: Mon, 31 Jan 2022 15:45:59 -0800
MIME-Version: 1.0
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: https://bugs.webkit.org/
Auto-Submitted: auto-generated

<html>
    <head>
      <base href="https://bugs.webkit.org/">
    </head>
    <body>
      <p>
        <div>
            <b><a class="bz_bug_link 
          bz_status_NEW "
   title="NEW - git-webkit should allow rebasing to master without committing or \
stashing local changes"  \
href="https://bugs.webkit.org/show_bug.cgi?id=235861#c3">Comment # 3</a>  on <a \
class="bz_bug_link   bz_status_NEW "
   title="NEW - git-webkit should allow rebasing to master without committing or \
stashing local changes"  href="https://bugs.webkit.org/show_bug.cgi?id=235861">bug \
235861</a>  from <span class="vcard"><a class="email" \
href="mailto:jbedard&#64;apple.com" title="Jonathan Bedard \
&lt;jbedard&#64;apple.com&gt;"> <span class="fn">Jonathan Bedard</span></a> \
                </span></b>
        <pre>(In reply to Ryosuke Niwa from <a \
href="show_bug.cgi?id=235861#c2">comment #2</a>) <span class="quote">&gt; (In reply \
to Jonathan Bedard from <a href="show_bug.cgi?id=235861#c1">comment #1</a>) &gt; &gt; \
The implementation that first came to my mind would be controversial because &gt; \
&gt; it wouldn't work well from a branch, but turns out that `git pull` has an &gt; \
&gt; `--autostash` option, which should do what you're asking. &gt; 
&gt; oh, that's neat. so that'll stash, pull, then stash apply?</span >

Looks like it creates a temporary stash commit to be compatible with --rebase, but \
basically yes.</pre>  </div>
      </p>

      <hr>
      <span>You are receiving this mail because:</span>

      <ul>
          <li>You are the assignee for the bug.</li>
      </ul>
    </body>
</html>
--1643672759.ac38A3.30558--

_______________________________________________
webkit-unassigned mailing list
webkit-unassigned@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-unassigned

[prev in list] [next in list] [prev in thread] [next in thread] 