diff options
| author | Adam Simpkins <adam@adamsimpkins.net> | 2008-06-01 13:56:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-01 21:44:47 -0700 |
| commit | f1979d6b3fba41fb6ca92290bf8e10d58ede8970 (patch) | |
| tree | 11c35606b71b210393f25b59c3c9c578edb53352 /git-merge-one-file.sh | |
| parent | 3395908ee481e91bbe3ba054a7419b071b09cdef (diff) | |
| download | git-f1979d6b3fba41fb6ca92290bf8e10d58ede8970.tar.gz git-f1979d6b3fba41fb6ca92290bf8e10d58ede8970.tar.xz | |
graph API: avoid printing unnecessary padding before some octopus merges
When an octopus merge is printed, several lines are printed before it to
move over existing branch lines to its right. This is needed to make
room for the children of the octopus merge. For example:
| | | |
| | \ \
| | \ \
| | \ \
| M---. \ \
| |\ \ \ \ \
However, this step isn't necessary if there are no branch lines to the
right of the octopus merge. Therefore, skip this step when it is not
needed, to avoid printing extra lines that don't really serve any
purpose.
Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions