diff options
| author | Richard Hansen <rhansen@bbn.com> | 2013-09-04 15:04:31 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 15:03:03 -0700 |
| commit | a8a5406ab32fccabf8ed08001d50b5373e18ff1a (patch) | |
| tree | 82ec0a98750812e269b935eb369671ad84be8b45 /contrib/examples | |
| parent | bb8040f9f9274d739b894230959134584b156ae5 (diff) | |
| download | git-a8a5406ab32fccabf8ed08001d50b5373e18ff1a.tar.gz git-a8a5406ab32fccabf8ed08001d50b5373e18ff1a.tar.xz | |
use 'commit-ish' instead of 'committish'
Replace 'committish' in documentation and comments with 'commit-ish'
to match gitglossary(7) and to be consistent with 'tree-ish'.
The only remaining instances of 'committish' are:
* variable, function, and macro names
* "(also committish)" in the definition of commit-ish in
gitglossary[7]
Signed-off-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples')
| -rwxr-xr-x | contrib/examples/git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index 7b922c394..a5e42a9f0 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -263,7 +263,7 @@ fi # This could be traditional "merge <msg> HEAD <commit>..." and the # way we can tell it is to see if the second token is HEAD, but some -# people might have misused the interface and used a committish that +# people might have misused the interface and used a commit-ish that # is the same as HEAD there instead. Traditional format never would # have "-m" so it is an additional safety measure to check for it. |