Dennis Koot koter84

## __cidr-to-ip.sh
#!/bin/bash

############################
##  Methods
############################
prefix_to_bit_netmask() {
    prefix=$1;
    shift=$(( 32 - prefix ));

    bitmask=""

## git-selective-merge.md

      
        
          
            
              
              1 file
            
          
          
            
              
              52 forks
            
          
          
            
              
              45 comments
            
          
          
            
              
              269 stars
            
          
        
        
          
              
          
          
            
                katylava
                / git-selective-merge.md
            
            
              Last active
              February 27, 2024 10:18
            
              
                git selective merge
              
          
        
      
        
  
      
    Update 2022: git checkout -p <other-branch> is basically a shortcut for all this.
FYI This was written in 2010, though I guess people still find it useful at least as of 2021. I haven't had to do it ever again, so if it goes out of date I probably won't know.
Example: You have a branch refactor that is quite different from master. You can't merge all of the
commits, or even every hunk in any single commit or master will break, but you have made a lot of
improvements there that you would like to bring over to master.
Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.
	#!/bin/bash

	############################
	## Methods
	############################
	prefix_to_bit_netmask() {
	prefix=$1;
	shift=$(( 32 - prefix ));

	bitmask=""