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:

Comments

Post a Comment

Popular posts from this blog

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

Procedure to enable wireless LAN adapter in vmware!

I have went to find the way in which wlan in Kali Linux could be made listed my airmon-ng command. Most of the videos and posts suggested me that it is necessary to have another wi-fi adapter to have connected to wifi network. But this is not necessary. The procedure to do this is as follows: 1. Download this package in Virtual Machine(Kali linux) " http://wireless.kernel.org/download/compat-wireless-2.6/compat-wireless-2010-06-26-p.tar.bz2" 2.Unzip this package in terminal i.e navigate to place where you have downloaded this file , say desktop then type : cd Desktop for unzip type : tar -jxvf compat-wireless-2010-06-26-p.tar.bz2 3. Navigate into the uncompressed directory and type: i."make unload"  (only words within the quotes are the commands) ii."make load" Done!  now airmon-ng  should have the list of the required devices.
2 comments
Read more