diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-04-15 16:56:00 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:07:00 +0100 |
| commit | 58eb6a81d7b7cc482fa36f2f653c393f84d927da (patch) | |
| tree | 398ae8d902ce98e1494cb82d4447d1d4d8961774 | |
| parent | a3cdf76fc1775112f5cc6e5d2a711fabc37f3f17 (diff) | |
git-debrebase(5): Untabify the diagram a bit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rw-r--r-- | git-debrebase.5.pod | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index 8433eda..26e4813 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -107,9 +107,9 @@ See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>. 1 1 1 breakwater branch, merging baseline / / / unmodified upstream code ---@-----@--A----@--B--C plus debian/ (but no debian/patches) - / / / no ref refers to this: we + / / / no ref refers to this: we --#-----#-------#-----> upstream reconstruct its identity by - inspecting interchange branch + inspecting interchange branch Key: 1,2,3 commits touching upstream files only |