jprdonnelly/docs
1
0
Fork 0
mirror of synced 2026-01-01 18:05:46 -05:00
Code Issues Projects Releases Wiki Activity
26,023 Commits 28 Branches 1 Tag
37e43594de4954b811350f483c99f440cda4bf7e
Commit Graph

1459 Commits

Author SHA1 Message Date
Steve Guntrip
4e8c357d5e clarify 2fa prompt and password requirement 2021-05-27 10:58:02 +01:00
Steve Guntrip
d5cb9c53c0 Merge branch 'main' into 2fa-clarification 2021-05-27 08:51:29 +01:00
Octomerger Bot
d7964b88f8 Merge branch 'main' into repo-sync 2021-05-27 12:43:16 +10:00
Lucas Costi
e64397e85a DMCA section lettering fix (#19583) 2021-05-27 01:43:58 +00:00
Pushkar Patel
8a58d7f351 Add a section on how to star a repository (#6686) 2021-05-27 01:43:38 +00:00
Janice
625d630fad Merge branch 'main' into patch-1 2021-05-26 17:36:33 -07:00
Janice
529fd81847 Merge branch 'main' into patch-1 2021-05-26 17:26:11 -07:00
Octomerger Bot
b5aa36ec3e Branch was updated using the 'autoupdate branch' Actions workflow. 2021-05-27 10:25:39 +10:00
Janice
d333e37c0b Merge branch 'main' into codewithdev-docs-1 2021-05-26 17:16:33 -07:00
Abby Vollmer
c1ce4bf998 Additional Product Terms refresh (#19346) 
Co-authored-by: Lee Dohm <1038121+lee-dohm@users.noreply.github.com>
Co-authored-by: Felicity Chapman <felicitymay@github.com>
Co-authored-by: Lucas Costi <lucascosti@users.noreply.github.com>
 2021-05-27 00:06:07 +00:00
Abby Vollmer
ec5797cedb DMCA 1201 updates (#18578) 
Co-authored-by: Laura Coursen <lecoursen@github.com>
Co-authored-by: Jesse Geraci <6133249+jessephus@users.noreply.github.com>
Co-authored-by: Felicity Chapman <felicitymay@github.com>
Co-authored-by: Mike Linksvayer <mlinksva@github.com>
 2021-05-26 23:59:53 +00:00
Janice
8b40821ed9 Merge branch 'main' into codewithdev-docs-1 2021-05-26 16:58:35 -07:00
Janice
3f8c5909ab Update content/github/writing-on-github/index.md 2021-05-26 16:56:29 -07:00
Lucas Costi
36b28d517e Re-version 'Renaming a branch' for GHES 3.1 (#19511) 
Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>
 2021-05-26 22:15:14 +00:00
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 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
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
Matt Pollard
b3930a67e5 Create product for billing and payments (#19389) 2021-05-25 15:02:54 +00: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
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
⚡ Aditya Patel ⚡
dd374a19e7 Merge branch 'main' into patch-1 2021-05-22 09:01:16 +05:30
Janice
4a3036cedf Merge branch 'main' into flytewizard-import-projects-intro 2021-05-21 13:31:44 -07:00
Dev Prakash Sharma
ce0c7177a4 Updated Fork a Repo 2021-05-22 01:06:16 +05:30
Dev Prakash Sharma
90b2e7e462 Updated Glossary Introduction 2021-05-22 00:59:18 +05:30
Ethan Palm
96206ba3f3 Update "About forks" section 2021-05-21 15:08:07 -04:00
Dev Prakash Sharma
d01d2d9645 Update fork-a-repo.md 2021-05-22 00:10:55 +05:30
Dev Prakash Sharma
99fa9b00a8 Updated fork a Repo 2021-05-22 00:08:45 +05:30
Dev Prakash Sharma
5f4de5391f Merge branch 'github:main' into codewithdev-docs1 2021-05-21 23:56:59 +05:30
Dev Prakash Sharma
7b7f898cc3 Updated Glossary Introduction 2021-05-21 23:55:26 +05:30
Janice
226dd8a5c1 Merge branch 'main' into flytewizard-import-projects-intro 2021-05-21 09:47:07 -07:00
Janice
8c51b9b649 Update content/github/importing-your-projects-to-github/index.md 2021-05-21 09:43:50 -07:00
⚡ Aditya Patel ⚡
929d23ab43 Merge branch 'main' into patch-1 2021-05-21 21:39:14 +05:30
Allie
0149b479f0 Update Searching code to note that @ is excluded (#19419) 2021-05-21 09:46:25 +00:00
⚡ Aditya Patel ⚡
5e97b1e2ce Merge branch 'main' into patch-1 2021-05-21 09:30:00 +05:30
jmarlena
432981ec5e Last batch of style changes 2021-05-20 15:29:25 -07:00
jmarlena
7e83b4808b Small style updates 2021-05-20 15:28:13 -07:00
jmarlena
1713581e44 Merge branch 'main' into patch-1 2021-05-20 15:20:51 -07:00
Jennifer Chermoshnyuk
3abb7a07a1 Delete content/github/finding-talent-with-github-jobs directory 
With the deprecation of GitHub Jobs this should likely be removed.
 2021-05-20 11:36:00 -07:00