summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-25 16:23:22 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-25 16:23:22 -0700
commit84da3e21dc008fe7ba18811e8b7f7614ede33079 (patch)
treeae38b34e05bc01e62d451da664c8d7bfb8557711 /revision.c
parent6741c2e64adabfa0422b6d60db177ca88a5eca35 (diff)
parent0c47695a69da42df4c4b7a9dad4ba083c604e3d1 (diff)
downloadgit-84da3e21dc008fe7ba18811e8b7f7614ede33079.tar.gz
Merge branch 'js/log-abbrev-commit-config'
* js/log-abbrev-commit-config: Add log.abbrevCommit config variable "git log -h": typofix misspelled 'suppress'
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 7934b2f68b..7588a60b8e 100644
--- a/revision.c
+++ b/revision.c
@@ -1428,6 +1428,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->abbrev = 40;
} else if (!strcmp(arg, "--abbrev-commit")) {
revs->abbrev_commit = 1;
+ revs->abbrev_commit_given = 1;
+ } else if (!strcmp(arg, "--no-abbrev-commit")) {
+ revs->abbrev_commit = 0;
} else if (!strcmp(arg, "--full-diff")) {
revs->diff = 1;
revs->full_diff = 1;