1
0
mirror of synced 2025-12-21 10:57:10 -05:00
Commit Graph

23 Commits

Author SHA1 Message Date
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
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
Dev Prakash Sharma
96771f9e94 Intro Added to Commits/Notification Category (#7095) 2021-06-21 18:49:01 +01: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
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 Schneider
f7e848e0c4 ran script/content-migrations/remove-map-topics.js && script/content-migrations/update-tocs.js 2021-05-19 10:12:38 -04:00
Emily Gould
5a20716c7e Restructure and move Git content (#18336)
* Rename map topic

* Delete map topic

* Rename map topic

* Add redirect

* Remove last two map topics

* Move article on adding a remote into a long-form guide

* Move article on changing a remote's URL

* Move articles on renaming and removing remotes

* Move remote URL article

* Fix typo

* Remove category index file

* Move a few articles to the new category

* Move a few more files

* Move managing remote repos article

* Move the rest of the getting started with git map topic

* Move the first half of the using git map topic

* Move the rest of the articles and 🔥 the directory

* Fix failing test

* Remove Using Git from product index

* Apply suggestions from code review

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Apply suggestions from code review

Co-authored-by: Laura Coursen <lecoursen@github.com>
2021-03-25 14:42:36 -05:00
Daniel Tamkin
9669f20ff5 fix: Update commit trailer Tip (#2003)
* Update commit trailer Tip

Previously stated "Co-authored-by:" when it should say "on-behalf-of". Found https://docs.github.com/en/free-pro-team@latest/github/committing-changes-to-your-project/creating-a-commit-on-behalf-of-an-organization

* refactor: remove dependency of reusable file, by hard-copy

* refactor: remove reusable file

Co-authored-by: hubwriter <hubwriter@github.com>
2021-01-14 08:59:11 +00:00
Sarah Schneider
8d7a4aec4b ran script/content-migrations/remove-html-comments-from-index-files.js 2020-11-24 09:10:46 -05:00
Janice Niemeir
fec34af2c3 another broken link fix 2020-11-13 15:45:05 -07:00
Janice Niemeir
1968462aef review edits and fix broken anchor link 2020-11-13 15:00:05 -07:00
Laura Coursen
a3e1733aa1 GitHub AE (GHAE) (#16090) 2020-11-02 15:12:44 -06:00
Laura Coursen
a51872d042 Change != "free-pro-team@latest" to enterpriseServerVersions contains currentVersion, actually (#16114)
* Run script/new-versioning/update-not-fpt-conditionals.js

* Fix a few things

* Remove outdated versioning

* Fix broken link

Co-authored-by: jmarlena <6732600+jmarlena@users.noreply.github.com>
2020-10-21 21:33:43 -07:00
Ruth Ikegah
9e6b0a6dd3 Update changing-a-commit-message.md 2020-10-08 19:49:00 +01:00
Ruth-ikegah
6ff006211d Reorganized changing commit message docs 2020-10-08 02:54:25 +01:00
Matt Pollard
aa3a4edb62 Document features and changes for phase 2.5 of master/main transition (#15745) 2020-10-01 16:43:01 -07:00
Jason Etcovitch
caaee7a124 Update all files to use {% data %} (#15253)
* Add back changes from prior to purge

* Manually fix some invalid Liquid

* Updoot render-content

* Improve test messages to show correct output

* Run el scripto

* Pass the remaining test
2020-09-29 16:01:04 -04:00
Vanessa Yuen
3df90fc9b8 Hello git history spelunker!
Are you looking for something? Here is all of the GitHub Docs history in one single commit. Enjoy! 🎉
2020-09-27 14:10:11 +02:00