Skip to main content

Git --CheetSheet=3

Rebase Plot:
 
There is brach named "kennel", this needs to be merged on to master without merge conflicts. So go to branch "kennel" and rebase "master" on it. Then go to "master" and merge "kennel" into "master".

Strategy :

1.git checkout kennel

2.git rebase master

3.git checkout master


________________________________________________________________________________

For no merge conflicts :

1. git fetch #retrieve changes from remote without merging into current branch.

2. git rebase #put the fetched remote commits beneath the present commits.

4.git merge kennel


_______________________________________________________________________________

History

1. git log --pretty=oneline
2. git diff
3. git diff master elephant #compare one brachn with another.
4. git diff HEAD~2 HEAD
5. git log -p
6. git blame <file_name>

_______________________________________________________________________________

7. git config user.email "admin@example.com  %local repo config

8. git config alias.commitasli commit

Labels

Labels:

Comments

Post a Comment

Popular posts from this blog

ASCII to Decimal conversion

#include "msp430.h"                     ; #define controlled include file         NAME    main                    ; module name         PUBLIC  main                    ; make the main label vissible                                         ; outside this module         ORG     0FFFEh         DC16    init                    ; set reset vector to 'init' label         RSEG    CSTACK                  ; pre-declaration of segment         RSEG    CODE      ...
Post a Comment
Read more

Event Sourcing with CQRS.

  The way event sourcing works with CQRS is to have  part of the application that models updates as writes to an event log or Kafka topic . This is paired with an event handler that subscribes to the Kafka topic, transforms the event (as required) and writes the materialized view to a read store.
Post a Comment
Read more

Create One-Click Shutdown and Reboot Shortcuts

First, create a shortcut on your desktop by right-clicking on the desktop, choosing New, and then choosing Shortcut. The Create Shortcut Wizard appears. In the box asking for the location of the shortcut, type shutdown. After you create the shortcut, double-clicking on it will shut down your PC. But you can do much more with a shutdown shortcut than merely shut down your PC. You can add any combination of several switches to do extra duty, like this: shutdown -r -t 01 -c "Rebooting your PC" Double-clicking on that shortcut will reboot your PC after a one-second delay and display the message "Rebooting your PC." The shutdown command includes a variety of switches you can use to customize it. Table 1-3 lists all of them and describes their use. I use this technique to create two shutdown shortcuts on my desktop—one for turning off my PC, and one for rebooting. Here are the ones I use: shutdown -s -t 03 -c "Bye Bye m8!" shutdown -r -t 03 -c ...
Post a Comment
Read more