#git #cheat-cheet #reflog

#git

Quite often, we must modify a file that has already been committed to the local repository. In this case, we often end up with commit messages like: “Fixed typo.”, “Added missing parameter.”, “Removed redundant import.”

At some point, we realize that such commit clutter the code history, and it is better to avoid them. Fortunately, there are at least two options to get rid of them.

Forge allows you to work with Git forges, such as Github and Gitlab, from the comfort of Magit and the rest of Emacs.

Forge fetches issues, pull-requests and other data using the forge’s API and stores that in a local database. Additionally it fetches the pull-request references using Git. Forge implements various features that use this data but the database and pull-request refs can also be used by third-party packages.

Write to your GitHub activity chart. Contribute to ihabunek/github-vanity development by creating an account on GitHub.

Use magit-ediff or 'e' on an unmerged item to resolve merge conflicts with ediff. Magit will set up an ediff with three buffers A, B and C. A and B are the original (conflicting) files, and C is the conflicted merge.

1. Generate SSH key:

   $ ssh-keygen -t rsa -C <email1@example.com>

2. Generate another SSH key:

   $ ssh-keygen -t rsa -f ~/.ssh/accountB -C <email2@example.com>

   Now, two public keys (id_rsa.pub, accountB.pub) should be exists in the ~/.ssh/ directory.

   $ ls -l ~/.ssh     # see the files of '~/.ssh/' directory 

3. Create config file ~/.ssh/config with the following contents:

   $ nano ~/.ssh/config
   
   Host bitbucket.org  
       User git  
       Hostname bitbucket.org
       PreferredAuthentications publickey  
       IdentityFile ~/.ssh/id_rsa  
   
   Host bitbucket-accountB  
       User git  
       Hostname bitbucket.org  
       PreferredAuthentications publickey  
       IdentitiesOnly yes  
       IdentityFile ~/.ssh/accountB  

4. Clone from default account.

   $ git clone git@bitbucket.org:username/project.git

5. Clone from accountB account.

   $ git clone git@bitbucket-accountB:username/project.git

See More Here

Git Large File Storage (LFS) replaces large files such as audio samples, videos, datasets, and graphics with text pointers inside Git, while storing the file contents on a remote server like GitHub.com or GitHub Enterprise.