man: rearrange git synopsis to fit in 80 lines

[git.git] / git-request-pull.sh

diff --git a/git-request-pull.sh b/git-request-pull.sh
index 7b5c777f0b137d9050dfed02eebe78f1a2ebd6c9..e6438e24c7c787b55428a48eca9461d772db7ee6 100755 (executable)
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -63,10 +63,8 @@ die "fatal: No commits in common between $base and $head"
 find_matching_ref='
        sub abbr {
                my $ref = shift;
-               if ($ref =~ s|refs/heads/||) {
+               if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
                        return $ref;
-               } elsif ($ref =~ s|refs/tags/||) {
-                       return "tag $ref";
                } else {
                        return $ref;
                }
@@ -98,7 +96,7 @@ git show -s --format='The following changes since commit %H:
   %s (%ci)
 
 are available in the git repository at:
-' $baserev &&
+' $merge_base &&
 echo "  $url${ref+ $ref}" &&
 git show -s --format='
 for you to fetch changes up to %H: