----BEGIN CLASS----
[13:57] <mbuf> #startclass
[13:57] <mbuf> Roll call
[13:57] <priyankasaggu119> Priyanka Saggu
[13:57] <brute4s99> Piyush Aggarwal
[13:57] <pooja_s> pooja sulakhe
[13:58] <mbuf> Welcome to the tenth session in the GNU Emacs series.
[13:58] <mbuf> Today, we will be going through the shortcuts of Magit.
[13:58] <devesh_verma> Devesh Verma
[13:58] <mbuf> I hope all you have watched the video that I sent to the mailing list.
[13:58] <nightwarrior-xx4> Aman Verma
[13:59] <mbuf> Magit is an interface to the Git version control system written for Emacs.
[13:59] <mbuf> In the FLOSS world, we always talk about "commit early, commit often", and hence VCS integration with your editor is very important.
[14:00] <mbuf> Since you are using GNU Emacs for all your work, having an interface for the same can greatly help in productivity.
[14:00] <mbuf> Like Org-mode, Magit is one of the most important and powerful packages that makes GNU Emacs very popular!
[14:01] <mbuf> I hope you have also installed Magit, and added the requires and "C-x g" shortcut in your Emacs configuration file
[14:01] <mbuf> This can save you lot of time, when you want to check the Magit buffer and perform Git operations
[14:02] <mbuf> From the terminal, clone this repo for testing, $ git clone https://gitlab.com/shakthimaan/operation-blue-moon.git
[14:02] <mbuf> Say, to /tmp/operation-blue-moon.git
[14:02] <mbuf> Open GNU Emacs, and then open the README.md file in the project.
[14:04] <mbuf> Add two lines in two different places in the README.md file.
[14:04] <brute4s99> Hi everyone!
[14:04] <brute4s99> Those who would be flying from New Delhi, let's catch up at some events in Delhi too!
[14:04] <brute4s99> sorry mbuf , misfired
[14:05] <mbuf> You should have added the following entry in your Emacs configuration already:
[14:05] <mbuf> (global-set-key (kbd "C-x g") 'magit-status)
[14:05] <mbuf> The "C-x g" command is used to open the Magit status buffer
[14:06] <mbuf> In GNU Emacs 26.1, the Magit buffer says "magit:operation-blue-moon.git" in the modeline
[14:06] <mbuf> It also shows in the top the Head, and latest commit
[14:06] <mbuf> This is followed by "Unstaged changes", "Staged changes" and "Recent commits"
[14:07] <mbuf> If there is nothing staged, then you will not see anything in the "Staged changes".
[14:07] <mbuf> You can toggle visibility of the current section using:
[14:07] <mbuf> => TAB
[14:08] <mbuf> You can cycle visibility of the section and its children using:
[14:08] <mbuf> => C-TAB
[14:08] <mbuf> You can cycle visibility of all sections in the buffer using:
[14:08] <mbuf> => S-TAB
[14:10] <mbuf> You can move no the next entry using:
[14:10] <mbuf> => n
[14:10] <mbuf> You can move to the previous entry using:
[14:10] <mbuf> => p
[14:10] <mbuf> If you want to move to the next section, you can use:
[14:10] <mbuf> => M-n
[14:10] <mbuf> Similarly, if you want to move to the previous section in the Magit buffer, you can use:
[14:10] <mbuf> => M-p
[14:11] <mbuf> You have added two lines in two different places in the README file.
[14:12] <mbuf> If you go to the "Unstaged changes", and hit TAB, it will show the changes
[14:12] <mbuf> Even if you have multiple changes to a file, you can selectively stage one or more changes. You can stage a change using:
[14:12] <mbuf> => s
[14:13] <mbuf> Go ahead and stage one of the change. You will see that this change (hunk) is moved to the "Staged changes"
[14:13] <mbuf> You can unstage a change at the point using:
[14:13] <mbuf> => u
[14:14] <mbuf> If you want to stage all the changes in the working tree, you can use:
[14:14] <mbuf> => S
[14:14] <mbuf> Similarly, if you want to unstage all the changes, you can use:
[14:14] <mbuf> => U
[14:15] <mbuf> The capital 'S', and 'U' refers to all the changes.
[14:16] <mbuf> If you have a new cloned repository, you need to ensure that your name and e-mail address are included in .git/config file inside the project repository
[14:16] <mbuf> For example:
[14:16] <mbuf> [user]
[14:16] <mbuf>         name = Shakthi Kannan
[14:16] <mbuf>         email = author@shakthimaan.com
[14:17] <mbuf> Go ahead and update the .git/config with your user and email details. Since, you are in the project repository directory and have the README file, you can just C-x C-f and open .git/config in a buffer, and update the same.
[14:18] <mbuf> To make a commit, you can use:
[14:18] <mbuf> => c
[14:18] <mbuf> It will open up a *magit-commit-popup* buffer with Switches, Options and Actions
[14:19] <mbuf> In order to make a commit, press "c" for Commit Action
[14:19] <mbuf> You will then be given a COMMIT_EDITMSG buffer where you can type the commit message
[14:20] <mbuf> Once, you have finished typing the commit message, you can make the final commit using:
[14:20] <mbuf> => C-c C-c
[14:20] <mbuf> You will then be brought back to the Magit buffer
[14:21] <mbuf> If you want to push the changes to the remote repository, you can use:
[14:21] <mbuf> => P
[14:21] <mbuf> It will again open a *magit-push-popup* buffer with Switches, Configure and Push options
[14:22] <mbuf> To simply push master to remote origin/master, you can use:
[14:22] <mbuf> => u
[14:24] <mbuf> If you want to pull from the remote repository, you can use:
[14:24] <mbuf> => F
[14:24] <mbuf> And again to pull into master from origin/master, you can use:
[14:24] <mbuf> => u
[14:25] <mbuf> If you want to abort making a commit, you can use:
[14:25] <mbuf> => C-c C-k
[14:26] <mbuf> In the magit status buffer, you can explore the logging history by starting with:
[14:26] <mbuf> => l
[14:26] <mbuf> This will open the *magit-log-popup* buffer, and again you have Switches, Options and Actions available for you
[14:27] <mbuf> To view the current log, you can use:
[14:27] <mbuf> => l
[14:27] <mbuf> If you want to see the Reflog, you can use:
[14:27] <mbuf> => r
[14:28] <mbuf> Anytime, you want to quit the buffer, and want to go back to the Magit status buffer, you can use:
[14:28] <mbuf> => q
[14:29] <mbuf> In the "Recent commits" in the Magit status buffer, you can view the commit changes by using:
[14:29] <mbuf> => RET
[14:29] <mbuf> IIt will open a magit-revision buffer with the commit changes and Git summary
[14:30] <mbuf> You can create a new branch using:
[14:30] <mbuf> => b
[14:30] <mbuf> It will open a magit-branch-popup buffer with options and actions
[14:31] <mbuf> If you want to create a tag version, you can use:
[14:31] <mbuf> => t
[14:31] <mbuf> And it will open a *magit-tag-popup* buffer give you options to create and delete tags.
[14:31] <mbuf> This is useful when you want to make tagged releases for your project
[14:32] <mbuf> If you want to reset the current master to something different, you can use:
[14:32] <mbuf> => x
[14:33] <mbuf> Stashing is useful if you want to temporarily keep aside your changes, because you have something else to work on in the project.
[14:33] <mbuf> To stash or apply the stash changes you can start the *magit-stash-popup* buffer using:
[14:33] <mbuf> => z
[14:34] <mbuf> If you want to only fetch your remote changes, you can use:
[14:34] <mbuf> => f
[14:35] <mbuf> You have already learn about Ediff. You can also open from the Magit status buffer using:
[14:35] <mbuf> => e
[14:36] <mbuf> When you want to bisect the history for debugging or troubleshooting, you can use:
[14:36] <mbuf> => B
[14:36] <mbuf> As how you can create branches from Magit, you can also merge them using:
[14:36] <mbuf> => m
[14:37] <mbuf> If a project has sub-modules, you can add, update, list them using the *magit-submodule-popup* buffer. To see the Actions available, use:
[14:37] <mbuf> => o
[14:38] <mbuf> From the README.md buffer, if you want to see the display edit history of the file, you can use:
[14:38] <mbuf> => M-x magit-blame
[14:39] <mbuf> In this Blame buffer, you can ask for the commit at the point using:
[14:39] <mbuf> => RET
[14:40] <mbuf> Magit will open a new magit-revision buffer with the exact commit where this line was added/updated
[14:40] <mbuf> You can move to the next chunk in this buffer using:
[14:40] <mbuf> => n
[14:40] <mbuf> You can move to the previous chunk in this buffer using:
[14:41] <mbuf> => p
[14:41] <mbuf> If you want to move to the next chunk in the same commit, you can use:
[14:41] <mbuf> => N
[14:42] <mbuf> If you want to move to the previous chunk in the same commit, use:
[14:42] <mbuf> => P
[14:42] <mbuf> If you want to turn off Magit blame mode, you can use:
[14:42] <mbuf> => q
[14:43] <mbuf> If you want to gitignore a file, you can use:
[14:43] <mbuf> => i
[14:45] <mbuf> You can initialize a Git repository from inside GNU Emacs using:
[14:45] <mbuf> => M-x magit-init
[14:45] <mbuf> Similarly, you can clone a repository using:
[14:45] <mbuf> => M-x magit-clone
[14:46] <mbuf> To start using rebasing, you can use:
[14:46] <mbuf> => r
[14:46] <mbuf> It will provide you with the *magit-rebase-popup* buffer, and you can use "i" to rebase interactively.
[14:47] <mbuf> The video that I shared in the mailing list has good examples on how to rebase with Magit.
[14:47] <mbuf> In any of the popup buffers, if you want to select a switch, just type the switch shortcut, and it will get selected.
[14:48] <mbuf> It will get highlighted, and you know the switch is on.
[14:48] <mbuf> You can open the diff buffer using:
[14:49] <mbuf> => d
[14:49] <mbuf> The *magit-diff-popup* buffer has options to show diff for unstaged, staged and working tree
[14:50] <mbuf> To see the help or dispatch popup, you can use:
[14:50] <mbuf> => h
[14:50] <mbuf> OR
[14:51] <mbuf> => ?
[14:51] <mbuf> There are other commands for cherry-picking, reverting, applying patches etc that you can try out as homework.
[14:52] <mbuf> These are some basic Magit commands that you will use on a daily basis.
[14:53] <mbuf> As I have mentioned to you earlier to use GNU Emacs on a daily basis, using Magit will greatly help you in committing early and committing often.
[14:53] <mbuf> Once you start using it, you will realize, how fast is the interface between editing and VCS.
[14:53] <mbuf> This ends this session on Magit.
[14:53] <mbuf> Any questions?
[14:54] <mbuf> Roll call
[14:54] <priyankasaggu119> Priyanka Saggu
[14:54] <palnabarun> Nabarun Pal
[14:54] <bhavin192> Bhavin Gandhi
[14:55] <akshayg96> Akshay Gaikwad
----END CLASS----