GIT IT CHALLENGE MYNAMEIS HOW TO
GIT IT CHALLENGE MYNAMEIS UPGRADE

On top you’ll see a list of local commits, followed by an explanation of the available commands. # Note that empty commits are commented out # However, if you remove everything, the rebase will be aborted. # If you remove a line here THAT COMMIT WILL BE LOST. # Rebase fcb7d7c.22dcc45 onto fcb7d7c # Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like 'squash', but discard this commit's log message # x, exec = run command (the rest of the line) using shell # These lines can be re-ordered they are executed from top to bottom.

GIT IT CHALLENGE MYNAMEIS UPGRADE

This will open your configured editor and present you with the following menu: pick 8a20121 Upgrade Ruby version to 2.1.3 # if you didn't specify any tracking information for this branch # you will have to add upstream and remote branch information: In that case an interactive rebase comes in handy: git rebase -interactive While -amend is very useful, it doesn’t help if the commit you want to reword is not the last one. The -force option is necessary here since the tree’s history was locally modified which means the push will be rejected by the remote server since no fast-forward merge is possible. An exception to this rule can be made if you are absolutely sure that no other developer has already checked out the previous version and based their own work on it, in which case a forced push ( git push -force) may still be ok. Please keep in mind that -amend actually will create a new commit which replaces the previous one, so don’t use it for modifying commits which already have been pushed to a central repository. Did you forget to add a file? Just add it and amend the previous commit! git add forgotten_file Git commit -amend -m 'New message' # set the new message directlyīut that’s not all git-amend can do for you. Typos happen, but luckily in the case of commit messages, it is very easy to fix them: git commit -amend # start $EDITOR to edit the message gitignore to avoid making the same mistake a second time: git reset filename # or git remove -cached filename echo filename >. In that case make sure you only remove the staged version, and add the file to your. However, git rm will remove it from both your staging area, as well as your file system, which may not be what you want. If you are not careful during a git add, you may end up adding files that you didn’t want to commit. Remove a file from git without removing it from your file system Git reset -hard HEAD~2 # undo last two commits, discard changesīe careful with the -hard option! It resets your working tree as well as the index, so all your modifications will be lost for good. This is when git reset comes in handy: git reset HEAD~2 # undo last two commits, keep changes Undo local commitsĪlas, sometimes it takes us a bit longer to realize that we are on the wrong track, and by that time one or more changes may already have been committed locally.

In case you’re wondering, the double dash ( -) is a common way for command line utilities to signify the end of command options. Git checkout - lib bin # also works with multiple arguments Unfortunately, the changes made in the process sometimes turn out to be less than optimal, in which case reverting the file to its original state can be the fastest and easiest solution: git checkout - Gemfile # reset specified path Sometimes the best way to get a feel for a problem is diving in and playing around with the code.

GIT IT CHALLENGE MYNAMEIS HOW TO

Learning Git? This Git tutorial covers the 10 most common Git tricks you should know about: how to undo commits, revert commits, edit commit messages, discard local files, resolve merge conflicts, and more.

Git it challenge mynameis