Problem: You rebased a branch (featureA) and now need to rebase a branch that depends on it (featureB).
Solution: Use git rebase --onto, which takes three parameters:
featureAfeatureA, in the "old" log/history of featureBfeatureB
| <!DOCTYPE html> | |
| <html lang="en"> | |
| <head> | |
| <meta charset="UTF-8"> | |
| <meta name="viewport" content="width=device-width, initial-scale=1"> | |
| <title></title> | |
| <link href="style.css" rel="stylesheet"> | |
| </head> | |
| <body> |
| #!/usr/bin/env python3 | |
| import argparse | |
| import csv | |
| import os.path | |
| import sys | |
| import logging | |
| import re | |
| """ |
| FROM php:8.1-alpine | |
| RUN set -ex \ | |
| && apk --no-cache add postgresql-dev | |
| RUN docker-php-ext-install pdo pdo_mysql pdo_pgsql |
| <?php | |
| # SQL setup: | |
| # CREATE TABLE payment_sequence (id INT NOT NULL); | |
| # INSERT INTO payment_sequence VALUES(0); | |
| # CREATE TABLE payment_log(id INT PRIMARY KEY, client_id INT, loop_id INT, ts DATETIME(6)); | |
| $db = new PDO("mysql:dbname=fundraising;host=database", 'fundraising', 'INSECURE PASSWORD'); | |
| $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| #!/usr/bin/env php | |
| <?php | |
| if (!empty($argv[1])) { | |
| $data = (string)$argv[1]; | |
| } elseif (!stream_isatty(STDIN)) { | |
| $data = stream_get_contents(STDIN); | |
| } else { | |
| echo "Usage: $argv[0] <base64_encoded_serialized_data>\n"; | |
| exit(1); |
| <?php | |
| // This example shows how to override implementations without subclassing, | |
| // using anonymous classes and traits. | |
| interface Animal { | |
| public function makeSound(): string; | |
| public function move(): string; | |
| } |
| #!/bin/bash | |
| # A script for use with fzf in a nvalt-like setting | |
| # (Either selecting a file or creating a new one) | |
| # Use like this: fzf --bind "enter:execute(./vimquery {q} {})+abort" | |
| if [ -z "$2" ]; then | |
| if [ ! -z "$1" ]; then | |
| vim "$1.md" | |
| fi |