On 12/04/18 10:30, Johannes Schindelin wrote:
Hi Phillip,
On Wed, 11 Apr 2018, Phillip Wood wrote:
On 10/04/18 13:30, Johannes Schindelin wrote:
Firstly let me say that I think expanding the documentation and having an
example is an excellent idea.
Thanks! At first, I meant to leave this fo
On 11/04/18 20:10, Eric Sunshine wrote:
On Wed, Apr 11, 2018 at 11:35 AM, Phillip Wood
wrote:
On 10/04/18 13:30, Johannes Schindelin wrote:
+The `reset` command is essentially a `git reset --hard` to the specified
+revision (typically a previously-labeled one).
s/labeled/labelled/
American
On Thu, Apr 12, 2018 at 2:30 AM, Johannes Schindelin
wrote:
>> I think it would be worthwhile to point out that unlike the other commands
>> this will not preserve untracked files. Maybe something like
>> "Note that unlike the `pick` or `merge` commands or initial checkout when the
>> rebase start
Johannes Schindelin writes:
> +
> +* Merge branch 'report-a-bug'
> +|\
> +| * Add the feedback button
> +* | Merge branch 'refactor-button'
> +|\ \
> +| |/
> +| * Use the Button class for all buttons
> +| * Extract a generic Button class from the DownloadButton one
> +
C
Hi Phillip,
On Wed, 11 Apr 2018, Phillip Wood wrote:
> On 10/04/18 13:30, Johannes Schindelin wrote:
>
> Firstly let me say that I think expanding the documentation and having an
> example is an excellent idea.
Thanks! At first, I meant to leave this for others to contribute, but I
think it mak
Hi Eric & Phillip,
On Wed, 11 Apr 2018, Eric Sunshine wrote:
> On Wed, Apr 11, 2018 at 11:35 AM, Phillip Wood
> wrote:
> > On 10/04/18 13:30, Johannes Schindelin wrote:
> >> +The `reset` command is essentially a `git reset --hard` to the specified
> >> +revision (typically a previously-labeled o
On Wed, Apr 11, 2018 at 11:35 AM, Phillip Wood
wrote:
> On 10/04/18 13:30, Johannes Schindelin wrote:
>> +The `reset` command is essentially a `git reset --hard` to the specified
>> +revision (typically a previously-labeled one).
>
> s/labeled/labelled/
American vs. British English spelling.
Cod
On 10/04/18 13:30, Johannes Schindelin wrote:
Firstly let me say that I think expanding the documentation and having
an example is an excellent idea.
+
+
+label onto
+
+# Branch: refactor-button
+reset onto
+pick 123456 Extract a generic Button class from the DownloadButton one
+p
Hi Martin,
On Tue, 10 Apr 2018, Martin Ågren wrote:
> On 10 April 2018 at 14:30, Johannes Schindelin
> wrote:
> > The --rebase-merges mode is probably not half as intuitive to use as
> > its inventor hopes, so let's document it some.
>
> I quite like this documentation. Well-structured and well
On 10 April 2018 at 14:30, Johannes Schindelin
wrote:
> The --rebase-merges mode is probably not half as intuitive to use as
> its inventor hopes, so let's document it some.
I quite like this documentation. Well-structured and well-paced.
Already after the first reading, I believe I understand ho
The --rebase-merges mode is probably not half as intuitive to use as
its inventor hopes, so let's document it some.
Signed-off-by: Johannes Schindelin
---
Documentation/git-rebase.txt | 125 +++
1 file changed, 125 insertions(+)
diff --git a/Documentation/git-reb
11 matches
Mail list logo