Search icon CANCEL
Subscription
0
Cart icon
Cart
Close icon
You have no products in your basket yet
Save more on your purchases!
Savings automatically calculated. No voucher code required
Arrow left icon
All Products
Best Sellers
New Releases
Books
Videos
Audiobooks
Learning Hub
Newsletters
Free Learning
Arrow right icon
Arrow up icon
GO TO TOP
Git for Programmers

You're reading from  Git for Programmers

Product type Book
Published in Jun 2021
Publisher Packt
ISBN-13 9781801075732
Pages 264 pages
Edition 1st Edition
Languages
Author (1):
Jesse Liberty Jesse Liberty
Profile icon Jesse Liberty
Toc

Table of Contents (16) Chapters close

Preface 1. Introduction 2. Creating Your Repository 3. Branching, Places, and GUIs 4. Merging, Pull Requests, and Handling Merge Conflicts 5. Rebasing, Amend, and Cherry-Picking 6. Interactive Rebasing 7. Workflow, Notes, and Tags 8. Aliases 9. Using the Log 10. Important Git Commands and Metadata 11. Finding a Broken Commit: Bisect and Blame 12. Fixing Mistakes 13. Next Steps
14. Other Books You May Enjoy
15. Index

Answers

What do you do if you left out a changed file in the last commit?

You solve this with the same command you use to modify the message in the last commit, using --amend, but you need to indicate that you do not want to edit the message (make sure your files are staged):

git --amend --no-edit

What do you do if you committed to the wrong branch?

Checkout or create the branch you want to have committed to and then use reset to remove the change from the remote branch, but leave your files in the index (staging area) to be committed to the new branch:

git branch <new branch>
git reset HEAD~ --hard

What do you do if you corrupted a file in a previous commit?

First, use git log to find a commit before the corruption. Get the ObjectID of that commit. Next, get the problem file (and only that file) from the good commit:

git checkout ObjectID --<path to file> 

Remember: The path to the file is relative to the root of the project.

...
lock icon The rest of the chapter is locked
Register for a free Packt account to unlock a world of extra content!
A free Packt account unlocks extra newsletters, articles, discounted offers, and much more. Start advancing your knowledge today.
Unlock this book and the full library FREE for 7 days
Get unlimited access to 7000+ expert-authored eBooks and videos courses covering every tech area you can think of
Renews at €14.99/month. Cancel anytime