From 00913e6a739c1fd5cddcdef592a3be8cd9464e44 Mon Sep 17 00:00:00 2001 From: John Eismeier Date: Tue, 20 Feb 2018 09:14:10 -0500 Subject: [PATCH 1/2] Propose fix typo --- inspect/index.html | 4 ++-- zh/inspect/index.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inspect/index.html b/inspect/index.html index 32945eb..4e90c46 100644 --- a/inspect/index.html +++ b/inspect/index.html @@ -91,7 +91,7 @@

d43427d Documentation/remote-helpers: Fix typos and improve language 272a36b Fixup: Second argument may be any arbitrary string b6c8d2d Documentation/remote-helpers: Add invocation section -5ce4f4e Documentation/urls: Rewrite to accomodate transport::address +5ce4f4e Documentation/urls: Rewrite to accommodate transport::address 00b84e9 Documentation/remote-helpers: Rewrite description 03aa87e Documentation: Describe other situations where -z affects git diff 77bc694 rebase-interactive: silence warning when no commits rewritten @@ -418,7 +418,7 @@

That's what we're looking for, but we don't want to have to figure out what commit the two branches diverged from every time. Luckily, Git has a shortcut for this. If you run git diff master...erlang (with - three dots in between the branch names), Git will automatically figure out + three dots in between the branch names), Git will automatically figure out what the common commit (otherwise known as the "merge base") of the two commit is and do the diff off of that.

diff --git a/zh/inspect/index.html b/zh/inspect/index.html index 0c5ae53..6df875d 100644 --- a/zh/inspect/index.html +++ b/zh/inspect/index.html @@ -81,7 +81,7 @@

d43427d Documentation/remote-helpers: Fix typos and improve language 272a36b Fixup: Second argument may be any arbitrary string b6c8d2d Documentation/remote-helpers: Add invocation section -5ce4f4e Documentation/urls: Rewrite to accomodate transport::address +5ce4f4e Documentation/urls: Rewrite to accommodate transport::address 00b84e9 Documentation/remote-helpers: Rewrite description 03aa87e Documentation: Describe other situations where -z affects git diff 77bc694 rebase-interactive: silence warning when no commits rewritten From 89fa98a0a5ec9f69dedc1a9d49215c66f71a082f Mon Sep 17 00:00:00 2001 From: John Eismeier Date: Tue, 20 Feb 2018 13:08:56 -0500 Subject: [PATCH 2/2] revert space bug (sorry) --- inspect/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inspect/index.html b/inspect/index.html index 4e90c46..de2c5f9 100644 --- a/inspect/index.html +++ b/inspect/index.html @@ -418,7 +418,7 @@

That's what we're looking for, but we don't want to have to figure out what commit the two branches diverged from every time. Luckily, Git has a shortcut for this. If you run git diff master...erlang (with - three dots in between the branch names), Git will automatically figure out + three dots in between the branch names), Git will automatically figure out what the common commit (otherwise known as the "merge base") of the two commit is and do the diff off of that.