1
0
mirror of synced 2026-01-07 09:01:31 -05:00
Commit Graph

1428 Commits

Author SHA1 Message Date
Aaron Harpole
8f14d7c9b5 Clarify squash and merge default commit message (#20165)
* Clarify squash and merge default commit message

Originally reported in https://github.com/github/coding/issues/1865, a customer was confused to find that merge commits don't count toward the total count of commits to determine this default squash merge commit message.

* Update content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md

Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com>
2021-06-28 10:23:48 +00:00
Jesse Ruderman
0a64c7591b Update about-forks.md: add a missing open-quote (#7721) 2021-06-27 11:45:32 +00:00
mc
1a6b6dd3f6 fix redirect (#20152) 2021-06-25 12:56:23 +00:00
Rachael Sewell
52cf583bdd add short titles to frontmatter (#20131) 2021-06-24 11:02:53 -07:00
Sarah Schneider
cb12455649 ran script/content-migrations/use-short-versions.js 2021-06-24 10:21:07 -04:00
Sarah Schneider
7de66fe4ef Merge branch 'main' of github.com:github/docs-internal into script-to-use-short-versions 2021-06-24 10:14:50 -04:00
Abby Vollmer
30a31bfff1 add Codespaces terms 2021-06-23 17:29:14 -07:00
Sarah Schneider
5e10cea9ac Merge branch 'main' of github.com:github/docs-internal into script-to-use-short-versions 2021-06-23 14:45:10 -04:00
bl-ue
4d72548832 Merge branch 'main' into fix-typos 2021-06-23 13:43:59 -04:00
bl-ue
e907960b0b Fix typos 2021-06-23 13:41:24 -04:00
Sarah Edwards
f5f7e03d60 [9 AM PST June 23, 2021] Issues vNext mega branch (#19969)
Co-authored-by: Laura Coursen <lecoursen@github.com>
Co-authored-by: Lauren Brose <labrose@github.com>
Co-authored-by: Martin Lopes <martin389@github.com>
Co-authored-by: Steve Guntrip <12534592+stevecat@users.noreply.github.com>
Co-authored-by: Ethan Palm <56270045+ethanpalm@users.noreply.github.com>
Co-authored-by: Lucas Costi <lucascosti@users.noreply.github.com>
Co-authored-by: Matt Butler <7584089+azenMatt@users.noreply.github.com>
2021-06-23 08:59:57 -07:00
lesleyanneb
0e25161b8f Add codec compatibility info (#20052)
Co-authored-by: Amy Burns <timeyoutakeit@github.com>
2021-06-23 12:22:24 +00:00
Janice
e8f00c76ae Merge branch 'main' into patch-1 2021-06-22 13:13:19 -07:00
Sarah Schneider
2aadc46f55 Merge branch 'script-to-use-short-versions' of github.com:github/docs-internal into script-to-use-short-versions 2021-06-22 13:00:01 -04:00
Sarah Schneider
6b5e30636c restore else text 2021-06-22 12:59:53 -04:00
Sarah Schneider
1c1417f288 Update content/github/managing-security-vulnerabilities/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies.md
Co-authored-by: Felicity Chapman <felicitymay@github.com>
2021-06-22 12:55:04 -04:00
Sarah Schneider
454d7844d8 fix conditional with multiple ifs 2021-06-22 12:53:08 -04:00
Sarah Schneider
0c35c0233b Merge branch 'main' of github.com:github/docs-internal into script-to-use-short-versions 2021-06-22 12:50:47 -04:00
Laura Coursen
6d193cbad2 Merge branch 'main' into patch-1 2021-06-22 14:44:58 +01:00
Luke Carrier
6c0390054e Fix Linguist "generated code" link 2021-06-22 11:54:05 +01:00
Steve Guntrip
5036bb2d1f Merge branch 'main' into flytewizard-commit-articles-intros 2021-06-22 11:29:19 +01:00
Steve Guntrip
2ff3c11c65 Update content/github/committing-changes-to-your-project/viewing-and-comparing-commits/differences-between-commit-views.md 2021-06-22 11:28:44 +01:00
Matt Pollard
b682393f85 Fix heading levels (#20033) 2021-06-22 09:36:08 +00:00
Daniel Compton
c58fa8e65b Add one-time Sponsorship (#18657) 2021-06-22 08:59:41 +00:00
Janice
181420f8bb Merge branch 'main' into patch-1 2021-06-21 12:46:03 -07:00
Dev Prakash Sharma
96771f9e94 Intro Added to Commits/Notification Category (#7095) 2021-06-21 18:49:01 +01:00
Daniel Adams
737bdd7431 Sync fork with upstream (Fetch upstream) via web UI (#19806) 2021-06-21 17:49:17 +02:00
Junko Suzuki
e713a3a4b9 Update Meta endpoint description (#19831)
Co-authored-by: Lucas Costi <lucascosti@users.noreply.github.com>
Co-authored-by: Martin Lopes <martin389@github.com>
2021-06-21 11:34:32 +10:00
Janice
2340990f74 Merge branch 'main' into patch-1 2021-06-18 15:33:26 -07:00
Emily Gould
1e5372ac79 Move Getting started category to top-level doc set (#20008)
* Move category to top-level doc set

* Move doc set to the top and update short title

* Undo package-lock changes

* updated hardcoded refs in tests

* Update test

* Fix hardcoded link in test

Co-authored-by: Sarah Schneider <sarahs@github.com>
2021-06-18 17:13:04 +00:00
Ben Hutton
d52299a5c8 Correct filter name
Filter for discussions is `is:discussion` without the `s`
2021-06-18 08:50:04 +01:00
Emma Makinson
e9048d696a Adds documentation for cmd-e shortcut (#19889) 2021-06-18 07:16:35 +00:00
Grace Park
184543bf40 adding one more redirect_from article 2021-06-17 08:53:33 -07:00
Grace Park
43cefe6de8 adding back redirect_from 2021-06-17 08:44:39 -07:00
Cornelius Roemer
03d825b8a1 Update generating-a-new-gpg-key.md
The interactive gpg key creation flow is different to how the docs here make them sound. I've made it less specific so as not to confuse people.
2021-06-16 17:33:17 +02:00
Grace Park
5dd156c726 pages test passes 2021-06-15 14:54:47 -07:00
Sarah Schneider
43a8fa2260 Merge branch 'main' of github.com:github/docs-internal into script-to-use-short-versions 2021-06-15 15:04:26 -04:00
Sarah Schneider
8d3375d75c remove deprecated content 2021-06-15 13:39:19 -04:00
Lee Dohm
ac4c123006 Merge branch 'main' into aup-headings-fix 2021-06-15 09:05:42 -07:00
Sarah Schneider
c89152faa2 more liquid fixes 2021-06-15 11:23:28 -04:00
moritzebeling
260a1b7349 More info on "remote origin already exists" (#7176) 2021-06-15 12:51:37 +01:00
Lucas Costi
7fea0c6c58 AUP headings update 2021-06-15 11:00:07 +10:00
Abby Vollmer
f399282f44 Merge branch 'main' into Add-hyperlinks-and-reorder-AUP 2021-06-14 14:53:28 -07:00
Grace Park
6f7e4f50dc updating content files 2021-06-14 12:06:52 -07:00
Dominique Charlebois
e32b995394 Update differences-between-commit-views.md 2021-06-13 12:17:33 -07:00
Dominique Charlebois
7e3addd8ca Update comparing-commits.md 2021-06-12 20:31:47 -07:00
Dominique Charlebois
b22ca2a57e Add intro to comparing commits 2021-06-12 20:15:19 -07:00
Sarah Schneider
61ecb0d3cc Merge branch 'main' into fix-liquid-conditionals 2021-06-11 14:33:45 -04:00
Sarah Schneider
f1c9629b26 Update content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
Co-authored-by: Lucas Costi <lucascosti@users.noreply.github.com>
2021-06-11 09:35:39 -04:00
Felicity Chapman
0389340998 GHAE docs feature flag: Conversation menu and conversation resolution branch protection rule (#19547) 2021-06-11 08:24:15 +00:00