diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 11:08:22 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 11:08:22 +0300 |
commit | 8e36002adda45a35c6fc4daf81913c3d2102cb59 (patch) | |
tree | e3640ac0242262814f2b2d4c2a01c4332faeb18c /contrib | |
parent | a48ce378585054f2ae3b2f0e18346ab005290524 (diff) | |
parent | 7560f547e614244fe1d4648598d4facf7ed33a56 (diff) |
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 'contrib')
-rwxr-xr-x | contrib/examples/git-merge.sh | 4 | ||||
-rwxr-xr-x | contrib/examples/git-resolve.sh | 2 | ||||
-rwxr-xr-x | contrib/subtree/t/t7900-subtree.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index ee99f1a4ee..932e78dbfe 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -399,7 +399,7 @@ case "$allow_fast_forward,$#,$common,$no_commit" in ?,1,"$1",*) # If head can reach all the merge then we are up to date. # but first the most common case of merging one remote. - finish_up_to_date "Already up-to-date." + finish_up_to_date "Already up to date." exit 0 ;; t,1,"$head",*) @@ -459,7 +459,7 @@ t,1,"$head",*) done if test "$up_to_date" = t then - finish_up_to_date "Already up-to-date. Yeeah!" + finish_up_to_date "Already up to date. Yeeah!" exit 0 fi ;; diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh index 70fdc27b72..3099dc851a 100755 --- a/contrib/examples/git-resolve.sh +++ b/contrib/examples/git-resolve.sh @@ -41,7 +41,7 @@ fi case "$common" in "$merge") - echo "Already up-to-date. Yeeah!" + echo "Already up to date. Yeeah!" dropheads exit 0 ;; diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 3c87ebaf57..d05c613c97 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -253,7 +253,7 @@ test_expect_success 'merge the added subproj again, should do nothing' ' # this shouldn not actually do anything, since FETCH_HEAD # is already a parent result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) && - check_equal "${result}" "Already up-to-date." + check_equal "${result}" "Already up to date." ) ' |