diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-02-15 15:31:54 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-02-15 15:31:54 -0700 |
| commit | 93d2c36d08ee95e7eaebc92bd0557569981b95cf (patch) | |
| tree | b9a09abf616715021df558714c534573842f470b | |
| parent | 31bfba0562eedcfdef3abed1d1a59ab3e90ff377 (diff) | |
| parent | 6af4af7ec3e4d31a0b66d660deebf396a62a17ff (diff) | |
Pseudomerge branch 'master' over 'next'
Mistakenly, the 'next' branch diverged from 'master'. This merge
commit nullifies the divergent commit so that 'next' be fast-forwarded
to 'master', like this:
% git checkout master
% git merge -s ours next
% git checkout next
% git merge --ff-only master
0 files changed, 0 insertions, 0 deletions