Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
| <?php | |
| // PHP sample code to show multipart file upload using the B2 Native API | |
| // User supplies optional -v for verbose output from curl, then bucket name | |
| // and path to local file | |
| $rest_index = null; | |
| $opts = getopt("v::", [], $rest_index); | |
| $args = array_slice($argv, $rest_index); |
| git checkout better_branch | |
| git merge --strategy=ours master # keep the content of this branch, but record a merge | |
| git checkout master | |
| git merge better_branch # fast-forward master up to the merge | |
| ---------------------- | |
| If you want your history to be a little clearer, I'd recommend adding some information to the merge commit message to make it clear what you've done. Change the second line to: |
| # Install ARCH Linux with encrypted file-system and UEFI | |
| # The official installation guide (https://wiki.archlinux.org/index.php/Installation_Guide) contains a more verbose description. | |
| # Download the archiso image from https://www.archlinux.org/ | |
| # Copy to a usb-drive | |
| dd if=archlinux.img of=/dev/sdX bs=16M && sync # on linux | |
| # Boot from the usb. If the usb fails to boot, make sure that secure boot is disabled in the BIOS configuration. | |
| # Set swedish keymap |
| auto lo | |
| iface lo inet loopback | |
| iface eth0 inet dhcp | |
| allow-hotplug wlan0 | |
| iface wlan0 inet dhcp | |
| wpa-ssid "SSID" | |
| wpa-psk "wpa_password" |
| [PlankItemsDockItemPreferences] | |
| Launcher=file:///usr/share/applications/application.desktop |
| [Desktop Entry] | |
| Version=1.0 | |
| Type=Application | |
| Name=Show Applications | |
| Comment=Show applications menu | |
| Exec=gdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval 'Main.overview.toggle();Main.overview.viewSelector._showAppsButton.checked = true;'; | |
| Icon=view-grid-symbolic | |
| Path= | |
| Terminal=false |
Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
| set imap_user = "[email protected]" | |
| set imap_pass = "" | |
| set smtp_url = "smtp://[email protected]:587" | |
| set smtp_pass = "" | |
| set from = "[email protected]" | |
| set realname = "FirstName LastName" | |
| set folder = "imaps://imap.gmail.com:993" | |
| set spoolfile = "+INBOX" |
| #!/bin/bash | |
| set -e | |
| if [ ! -z "$1" ]; then | |
| KERNEL="$1" | |
| else | |
| KERNEL="$(uname -r)" | |
| fi |
| default=0 | |
| timeout=10 | |
| splashimage=(hd0,0)/grub/splash.xpm.gz | |
| color green/black white/gray | |
| #hiddenmenu | |
| title Ubuntu 14.10 x64 | |
| root (hd0,0) | |
| kernel /casper/vmlinuz.efi ro root=/dev/sda1 file=/cdrom/preseed/ubuntu.seed boot=casper rhgb quiet splash -- | |
| initrd /casper/initrd.lz |