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

"Swift" from Programming Template

About Memory: 1. How do I get memory, i.e how are variables declared. Any specific facts and constrains about variables ? If type annotation like var Varb:Float ; is not used then it is mandatory to assign the initial value to the variable. "Var" keyword should get you the required memory. 2. How do we get the entry point for the program execution ? [ Example : main() in the C program ] Script based. There is no particular entry point. 3. How does dynamic memory handled ? Is it supported in first place ? Instances for the classes can be created. Automatic Reference counting mechanism has the strong reference to one of the variable. Till there is strong reference to the variable it'll be there in the memory. Once there is no strong reference it'll be de-initialized. [ Ref : https://developer.apple.com/library/content/documentation/Swift/Conceptual/Swift_Programming_Language/AutomaticReferenceCounting.html ] 4. What are the datatypes which are supported an...
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

Python Crash Course : Part 1

HISTORY :  Written by Guido Van Rossum in 1980s, i.e Guido started writing Python in 1989 December. Van Rossum is Python's principal author, and his continuing central role in deciding the direction of Python is reflected in the title given to him by the Python community,  benevolent dictator for life  (BDFL). INSTALLING PYTHON :  The python interpreted which can be downloaded from website www.python.org (https://www.python.org/download/releases) CHECKING SUCCESSFUL INSTALL : Open command prompt. Type " assoc .py " , without quotes. That should return ".py=Python.File Cool ! Up and Running to write the scripts !
1 comment
Read more