diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 08:08:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 08:08:22 (GMT) |
| commit | 8e36002adda45a35c6fc4daf81913c3d2102cb59 (patch) | |
| tree | e3640ac0242262814f2b2d4c2a01c4332faeb18c /templates | |
| parent | a48ce378585054f2ae3b2f0e18346ab005290524 (diff) | |
| parent | 7560f547e614244fe1d4648598d4facf7ed33a56 (diff) | |
| download | git-8e36002adda45a35c6fc4daf81913c3d2102cb59.zip git-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.gz git-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.bz2 | |
Merge branch 'ma/up-to-date'
Message and doc updates.
* ma/up-to-date:
treewide: correct several "up-to-date" to "up to date"
Documentation/user-manual: update outdated example output
Diffstat (limited to 'templates')
| -rwxr-xr-x | templates/hooks--pre-rebase.sample | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/hooks--pre-rebase.sample b/templates/hooks--pre-rebase.sample index b7f81c1..db5feab 100755 --- a/templates/hooks--pre-rebase.sample +++ b/templates/hooks--pre-rebase.sample @@ -58,7 +58,7 @@ then not_in_topic=`git rev-list "^$topic" master` if test -z "$not_in_topic" then - echo >&2 "$topic is already up-to-date with master" + echo >&2 "$topic is already up to date with master" exit 1 ;# we could allow it, but there is no point. else exit 0 |