| commit | 4de53ce0437e7326908c4a0571ac4ff9b8d5aeff | |
| author | Avery Pennarun <apenwarr@gmail.com> | |
| Wed, 16 Jul 2008 19:19:27 +0000 (16 15:19 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Jul 2008 00:56:59 +0000 (16 17:56 -0700) | ||
| tree | ab31d2bcbeb8445a49ae99375d5cfb518f8744e8 | treesnapshot (tar.gz zip) |
| parent | fcab40a389e99786a8276108cdbc1cda8caf502f | commitdiff |
Reword "your branch has diverged..." lines to reduce line length
The message length depends on the length of the branch name. In my case,
the branch name "origin/add-chickens2" put the first line of the "your
branch has diverged" message over 80 characters, which triggered "less -FS"
to not exit automatically as expected.
This patch rewords the messages to make the lines generally shorter, so
that you'd need a significantly longer branch name to trigger the problem.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The message length depends on the length of the branch name. In my case,
the branch name "origin/add-chickens2" put the first line of the "your
branch has diverged" message over 80 characters, which triggered "less -FS"
to not exit automatically as expected.
This patch rewords the messages to make the lines generally shorter, so
that you'd need a significantly longer branch name to trigger the problem.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| remote.c | diffblobblamehistory |