diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-21 15:03:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-21 15:03:39 -0700 |
| commit | bae7e3f153f90b96438e6972e31c540ae9cf8ca0 (patch) | |
| tree | 792835bf31211f0a39af09a09d508c360cd9dc5f /Documentation | |
| parent | bdea5bae226f92727be0e9fc4603099030e6496d (diff) | |
| parent | 01826066b085ca136a1fc81ab964fab2d240ad86 (diff) | |
| download | git-bae7e3f153f90b96438e6972e31c540ae9cf8ca0.tar.gz | |
Merge branch 'ks/fix-rebase-doc-picture' into maint
Doc update.
* ks/fix-rebase-doc-picture:
doc: correct a mistake in an illustration
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 53f4e14444..652a99062c 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -675,7 +675,7 @@ on this 'subsystem'. You might end up with a history like the following: ------------ - o---o---o---o---o---o---o---o---o master + o---o---o---o---o---o---o---o master \ o---o---o---o---o subsystem \ |