1
0
mirror of synced 2026-01-30 06:01:34 -05:00
Commit Graph

2668 Commits

Author SHA1 Message Date
Mike McDonald
0895ffd1f1 Clarifying that branch protection must be enabled for auto-merge (#19483) 2021-05-26 17:47:54 +00:00
Yeikel
d9593f466b Suggest users to use --force-with-lease instead of --force
--force-with-lease is a safer and more recommended approach than --force


force overwrites a remote branch with your local branch.

--force-with-lease is a safer option that will not overwrite any work on the remote branch if more commits were added to the remote branch (by another team-member or coworker or what have you). It ensures you do not overwrite someone elses work by force pushing.

I think your general idea surrounding the command is correct. If the remote branch has the same value as the remote branch on your local machine- you will overwrite remote. If it doesn't have the same value- it indicates a change that someone else made to the remote branch while you were working on your code and thus will not overwrite any code. Obviously if there are additional commits in remote then the values won't be the same.

I just think of --force-with-lease as the option to use when I want to make sure I don't overwrite any teammates code. A lot of teams at my company use --force-with-lease as the default option for a fail-safe. Its unnecessary in most circumstances but will save you lots of headache if you happen to overwrite something that another person contributed to remote.

I'm sure you looked at the docs but there might be some more wordy explanation contained in here:

Read more : https://stackoverflow.com/questions/52823692/git-push-force-with-lease-vs-force
2021-05-26 13:15:25 -04:00
Sarah Edwards
15aaf6e065 Add links to improve discoverability (#19563) 2021-05-26 15:03:42 +00:00
Sarah Schneider
77e778f359 Merge branch 'main' of github.com:github/docs-internal into github-ae-release-notes 2021-05-26 09:45:44 -04:00
damiante
ab3ccedead Removed typo "to"
Removed the word "to" where it was erroneously inserted
2021-05-26 17:15:54 +10:00
mc
86eb89f697 [Ready to ship] GitHub Classroom - mention new starter assignment course (#18878) 2021-05-25 20:00:13 -07:00
Sarah Vessels
a69e61e4c7 Add sponsors.sponsor_sponsorship_payment_complete audit log event docs (#19382)
* Add sponsor_sponsorship_payment_complete event

* Note when 'created' fires

* Add sponsor_sponsorship_payment_complete

* Apply suggestions from code review

Co-authored-by: jmarlena <6732600+jmarlena@users.noreply.github.com>
2021-05-25 16:30:19 -07:00
Peter Mescalchin
ad1cdfc6eb Small tweak to an example file pattern match (#6660) 2021-05-25 22:10:15 +00:00
Josh Soref
b78de9f54c Correct steps outputs example -- it needs an id (#6695) 2021-05-25 21:28:05 +00:00
Nick Holden
f2aa0af938 Add endpoint for new organization events FGP (#19452)
Co-authored-by: Ethan Palm <56270045+ethanpalm@users.noreply.github.com>
2021-05-25 20:49:09 +00:00
Gary Munnelly
b901801e35 Add link to more info on storing git credentials
Added a link from the Linux section to Git Pro's instructions on storing git credentials with git. This provides some important elaboration on and alternatives to the instructions provided in the existing GitHub article.
2021-05-25 21:06:43 +01:00
Philip Durbin
619f2a8826 typo: "banch" 2021-05-25 15:25:25 -04:00
Sarah Edwards
7bb65a6388 Issues etc restructuring (#19506) 2021-05-25 19:00:59 +00:00
Kevin Sun
b37a34c953 [May 25, 2021] Adding documentation around comment resolution branch protection rule (#19381) 2021-05-25 17:35:46 +00:00
Steve Guntrip
f6af971924 Merge branch 'main' into update-marketplace-request 2021-05-25 16:29:26 +01:00
Matt Pollard
b3930a67e5 Create product for billing and payments (#19389) 2021-05-25 15:02:54 +00:00
Martin Lopes
c34031a583 Keep Actions docs up to date with security practices (#19076)
* Update security-hardening-for-github-actions.md

Co-authored-by: Lucas Costi <lucascosti@users.noreply.github.com>
Co-authored-by: Jaroslav Lobačevski <jarlob@github.com>
2021-05-25 22:26:51 +10:00
⚡ Aditya Patel ⚡
3443ee85e7 Merge branch 'main' into patch-1 2021-05-25 17:45:52 +05:30
jernej-9
c4e1cb7a97 Tweak information regarding the GitHub GPG key (#6615) 2021-05-25 12:19:07 +01:00
⚡ Aditya Patel ⚡
19151571e5 Merge branch 'main' into patch-1 2021-05-25 15:43:09 +05:30
Felicity Chapman
b71575e658 Remove leftover map topic (follow up PR) (#19517) 2021-05-25 09:12:45 +00:00
Dev Prakash Sharma
4865bd730e Added Intro 2021-05-25 10:58:41 +05:30
⚡ Aditya Patel ⚡
106096ef2e Merge branch 'main' into patch-1 2021-05-25 09:38:07 +05:30
Janice
111567bd66 Merge branch 'main' into patch-1 2021-05-24 19:59:00 -07:00
Janice
299fe08c0e Merge branch 'main' into patch-1 2021-05-24 19:44:59 -07:00
Janice
5c59c474c6 Merge branch 'main' into patch-1 2021-05-24 18:08:30 -07:00
Francis
82650049ce Enhancement: improve instructions for authenticating as an installation (#19474) 2021-05-24 16:51:03 -07:00
Janice
21638f59e7 Merge branch 'main' into patch-1 2021-05-24 16:43:03 -07:00
John Marshall
352c6768b2 Describe $RUNNER_OS/etc environment variables
Runners set up environment variables corresponding to the runner
context's properties. The runner context documents the runner.os,
runner.temp, and runner.tool_cache properties, so document these
three as supported environment variables similarly. The tool_cache
property value is not documented as being used for GitHub AE (see
context-and-expression-syntax-for-github-actions.md), so just leave
$RUNNER_TOOL_CACHE undocumented in this case.
2021-05-24 20:57:33 +01:00
Ashley Bass
a2606729b1 Update about-github-campus-program.md 2021-05-24 15:16:13 -04:00
Ashley Bass
3244557552 Updated GCP copy
GitHub Campus Program Information for Doc page
2021-05-24 14:59:30 -04:00
henock1
f3aced2806 Update link phrasing to correct grammatical tense 2021-05-24 10:55:56 -07:00
Laura Coursen
7567e8990f Remove GitHub Jobs category from index 2021-05-24 12:33:38 -05:00
Laura Coursen
e2ce5f7a9a Merge branch 'main' into jccwm-patch-1 2021-05-24 12:27:41 -05:00
ajs256
8a32526640 Merge branch 'main' into patch-2 2021-05-24 09:36:44 -07:00
Sarah Schneider
354c5d84d0 Merge branch 'main' of github.com:github/docs-internal into github-ae-release-notes 2021-05-24 12:00:06 -04:00
Sarah Schneider
de7d02af93 more merge-related updates 2021-05-24 11:59:55 -04:00
Sarita Iyer
cf1842947a fixed a few small things 2021-05-24 11:27:03 -04:00
Sarita Iyer
945824f8da adding changes made based on review 2021-05-24 11:07:07 -04:00
Sarita Iyer
7d998ed109 update with review feedback
Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com>
2021-05-24 11:05:06 -04:00
⚡ Aditya Patel ⚡
c72ec38fc4 Merge branch 'main' into patch-1 2021-05-24 20:23:07 +05:30
Sarah Schneider
ff718d7fc1 Merge branch 'main' of github.com:github/docs-internal into github-ae-release-notes 2021-05-24 10:00:07 -04:00
Steve Guntrip
8ee9671a1e Merge branch 'main' into update-oauth-state 2021-05-24 14:47:31 +01:00
⚡ Aditya Patel ⚡
f049204e33 Merge branch 'main' into patch-1 2021-05-24 17:09:26 +05:30
mc
53a889e61c version links for GHES 3.1 + (#19512) 2021-05-24 08:45:32 +00:00
Edoardo Pirovano
67a266e8b5 CodeQL Action: Add information about db-location option (#19418)
* CodeQL Action: Add information about `db-location` option

* Apply suggestions from code review

* Update content/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning.md

* Update content/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning.md

* Apply suggestions from code review

Co-authored-by: Aditya Sharad <6874315+adityasharad@users.noreply.github.com>

* Update content/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning.md

Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com>
Co-authored-by: Aditya Sharad <6874315+adityasharad@users.noreply.github.com>
2021-05-24 09:41:03 +01:00
mc
7e002e6008 Code scanning: replace deprecated --github-auth flag with new --github-auth-stdin flag (#19466)
* replace deprecated flag with new flag

* rework liquid versioning in article

* update flag descriptions to latest

* fix table formatting

* more table formatting

* Apply suggestions from code review

Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>

* address latest review comments

* version new flag for GHES 3.1+ only

* fix list numbeting

Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
2021-05-24 09:17:08 +01:00
Lucas Costi
b788f6fcf0 Revert "Reversion 'Renaming a branch' for GHES 3.1"
This reverts commit 27a5e23cac.
2021-05-24 12:32:07 +10:00
Lucas Costi
27a5e23cac Reversion 'Renaming a branch' for GHES 3.1 2021-05-24 12:25:06 +10:00
Graham Campbell
737d485c7a Removed broken/low quality/dead/archived PHP libraries 2021-05-23 11:55:25 +01:00