diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
| commit | 02615365a92ca2570c1f96abc8a97674aa2ccae1 (patch) | |
| tree | ebedfd91a0f6d299b39e84295e091e12c0767dc8 /git_version.sh | |
| parent | c3bad3042df505a3470f1e20b09822a9df1d4761 (diff) | |
| parent | adc67597f327cd43d58b1d0cb740dab14a75a058 (diff) | |
| download | systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.gz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.xz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.zip | |
Merge branch 'master' into pr6866
Conflicts:
ChangeLog: Removed
runtime/ChangeLog: Removed
runtime/sym.c: Merged
runtime/task_finder.c: Merged
tapset/ChangeLog: Removed
testsuite/ChangeLog: Removed
Diffstat (limited to 'git_version.sh')
| -rwxr-xr-x | git_version.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/git_version.sh b/git_version.sh index 50658970..d39d96c9 100755 --- a/git_version.sh +++ b/git_version.sh @@ -307,7 +307,6 @@ cat<<EOF # else /* !GIT_NOT_FOUND */ # define GIT_MESSAGE \\ GIT_DIST_MSG \\ - "git branch " GIT_BRANCH ", " \\ "commit " GIT_SHAID GIT_DIRTY_MSG \\ GIT_ERROR_MSG # endif /* GIT_NOT_FOUND */ |