summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-branch-rebase.txt
diff options
context:
space:
mode:
authorLibravatar Richard Hansen <rhansen@bbn.com>2013-09-04 15:04:31 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-04 15:03:03 -0700
commita8a5406ab32fccabf8ed08001d50b5373e18ff1a (patch)
tree82ec0a98750812e269b935eb369671ad84be8b45 /Documentation/howto/revert-branch-rebase.txt
parentuse 'tree-ish' instead of 'treeish' (diff)
downloadtgif-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 'Documentation/howto/revert-branch-rebase.txt')
-rw-r--r--Documentation/howto/revert-branch-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
index 0d5419e1a9..85f69dbac9 100644
--- a/Documentation/howto/revert-branch-rebase.txt
+++ b/Documentation/howto/revert-branch-rebase.txt
@@ -154,7 +154,7 @@ $ git pull . master
Packing 0 objects
Unpacking 0 objects
-* committish: e3a693c... refs/heads/master from .
+* commit-ish: e3a693c... refs/heads/master from .
Trying to merge e3a693c... into 8c1f5f0... using 10d781b...
Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
cache.h | 8 ++++----