- default, myers
The basic greedy diff algorithm. Currently, this is the default.
- minimal
Spend extra time to make sure the smallest possible diff is produced.
- patience
Use "patience diff" algorithm when generating patches.
- histogram
This algorithm extends the patience algorithm to "support low-occurrence common elements".
git-diff(1) Manual Page
NAME
git-diff - Show changes between commits, commit and working tree, etc
SYNOPSIS
git diff [options] [<commit>] [--] [<path>...] git diff [options] --cached [<commit>] [--] [<path>...] git diff [options] <commit> <commit> [--] [<path>...] git diff [options] <blob> <blob> git diff [options] [--no-index] [--] <path> <path>
DESCRIPTION
Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk.
- git diff [--options] [--] [<path>...]
This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you could tell Git to further add to the index but you still haven't. You can stage these changes by using git-add(1).
- git diff --no-index [--options] [--] [<path>...]
This form is to compare the given two paths on the filesystem. You can omit the --no-index option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git.
- git diff [--options] --cached [<commit>] [--] [<path>...]
This form is to view the changes you staged for the next commit relative to the named <commit>. Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD. If HEAD does not exist (e.g. unborned branches) and <commit> is not given, it shows all staged changes. --staged is a synonym of --cached.
- git diff [--options] <commit> [--] [<path>...]
This form is to view the changes you have in your working tree relative to the named <commit>. You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch.
- git diff [--options] <commit> <commit> [--] [<path>...]
This is to view the changes between two arbitrary <commit>.
- git diff [--options] <commit>..<commit> [--] [<path>...]
This is synonymous to the previous form. If <commit> on one side is omitted, it will have the same effect as using HEAD instead.
- git diff [--options] <commit>\...<commit> [--] [<path>...]
This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. "git diff A\...B" is equivalent to "git diff $(git-merge-base A B) B". You can omit any one of <commit>, which has the same effect as using HEAD instead.
Just in case if you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use ".." notations, can be any <tree>.
For a more complete list of ways to spell <commit>, see "SPECIFYING REVISIONS" section in gitrevisions(7). However, "diff" is about comparing two endpoints, not ranges, and the range notations ("<commit>..<commit>" and "<commit>\...<commit>") do not mean a range as defined in the "SPECIFYING RANGES" section in gitrevisions(7).
- git diff [options] <blob> <blob>
This form is to view the differences between the raw contents of two blob objects.
OPTIONS
- -p
- -u
- --patch
Generate patch (see section on generating patches).
This is the default.
- -s
- --no-patch
Suppress diff output. Useful for commands like git show that show the patch by default, or to cancel the effect of --patch.
- -U<n>
- --unified=<n>
Generate diffs with <n> lines of context instead of the usual three. Implies -p.
- --raw
Generate the raw format.
- --patch-with-raw
Synonym for -p --raw.
- --minimal
Spend extra time to make sure the smallest possible diff is produced.
- --patience
Generate a diff using the "patience diff" algorithm.
- --histogram
Generate a diff using the "histogram diff" algorithm.
- --diff-algorithm={patience|minimal|histogram|myers}
Choose a diff algorithm. The variants are as follows:
For instance, if you configured diff.algorithm variable to a non-default value and want to use the default one, then you have to use --diff-algorithm=default option.
- --stat[=<width>[,<name-width>[,<count>]]]
Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by giving another width <name-width> after a comma. The width of the graph part can be limited by using --stat-graph-width=<width> (affects all commands generating a stat graph) or by setting diff.statGraphWidth=<width> (does not affect git format-patch). By giving a third parameter <count>, you can limit the output to the first <count> lines, followed by ... if there are more.
These parameters can also be set individually with --stat-width=<width>, --stat-name-width=<name-width> and --stat-count=<count>.
- --numstat
Similar to --stat, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two - instead of saying 0 0.
- --shortstat
Output only the last line of the --stat format containing total number of modified files, as well as number of added and deleted lines.
- --dirstat[=<param1,param2,...>]
Output the distribution of relative amount of changes for each sub-directory. The behavior of --dirstat can be customized by passing it a comma separated list of parameters. The defaults are controlled by the diff.dirstat configuration variable (see git-config(1)). The following parameters are available:
- changes
Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given.
- lines
Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive --dirstat behavior than the changes behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other --*stat options.
- files
Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest --dirstat behavior, since it does not have to look at the file contents at all.
- cumulative
Count changes in a child directory for the parent directory as well. Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.
- <limit>
An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output.
Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: --dirstat=files,10,cumulative.
- --summary
Output a condensed summary of extended header information such as creations, renames and mode changes.
- --patch-with-stat
Synonym for -p --stat.
- -z
When --raw, --numstat, --name-only or --name-status has been given, do not munge pathnames and use NULs as output field terminators.
Without this option, each pathname output will have TAB, LF, double quotes, and backslash characters replaced with \t, \n, \", and \\, respectively, and the pathname will be enclosed in double quotes if any of those replacements occurred.
- --name-only
Show only names of changed files.
- --name-status
Show only names and status of changed files. See the description of the --diff-filter option on what the status letters mean.
- --submodule[=<format>]
Specify how differences in submodules are shown. When --submodule or --submodule=log is given, the log format is used. This format lists the commits in the range like git-submodule(1) summary does. Omitting the --submodule option or specifying --submodule=short, uses the short format. This format just shows the names of the commits at the beginning and end of the range. Can be tweaked via the diff.submodule configuration variable.
- --color[=<when>]
Show colored diff. --color (i.e. without =<when>) is the same as --color=always. <when> can be one of always, never, or auto. It can be changed by the color.ui and color.diff configuration settings.
- --no-color
Turn off colored diff. This can be used to override configuration settings. It is the same as --color=never.
- --word-diff[=<mode>]
Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see --word-diff-regex below. The <mode> defaults to plain, and must be one of:
- color
Highlight changed words using only colors. Implies --color.
- plain
Show words as [-removed-] and {+added+}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.
- porcelain
Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a +/-/ character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde ~ on a line of its own.
- none
Disable word diff again.
Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled.
- --word-diff-regex=<regex>
Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies --word-diff unless it was already enabled.
Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append |[^[:space:]] to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline.
The regex can also be set via a diff driver or configuration option, see gitattributes(1) or git-config(1). Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings.
- --color-words[=<regex>]
Equivalent to --word-diff=color plus (if a regex was specified) --word-diff-regex=<regex>.
- --no-renames
Turn off rename detection, even when the configuration file gives the default to do so.
- --check
Warn if changes introduce whitespace errors. What are considered whitespace errors is controlled by core.whitespace configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code.
- --full-index
Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output.
- --binary
In addition to --full-index, output a binary diff that can be applied with git-apply.
- --abbrev[=<n>]
Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. This is independent of the --full-index option above, which controls the diff-patch output format. Non default number of digits can be specified with --abbrev=<n>.
- -B[<n>][/<m>]
- --break-rewrites[=[<n>][/<m>]]
Break complete rewrite changes into pairs of delete and create. This serves two purposes:
It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number m controls this aspect of the -B option (defaults to 60%). -B/70% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).
When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number n controls this aspect of the -B option (defaults to 50%). -B20% specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file.
- -M[<n>]
- --find-renames[=<n>]
Detect renames. If n is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file's size). For example, -M90% means Git should consider a delete/add pair to be a rename if more than 90% of the file hasn't changed. Without a % sign, the number is to be read as a fraction, with a decimal point before it. I.e., -M5 becomes 0.5, and is thus the same as -M50%. Similarly, -M05 is the same as -M5%. To limit detection to exact renames, use -M100%. The default similarity index is 50%.
- -C[<n>]
- --find-copies[=<n>]
Detect copies as well as renames. See also --find-copies-harder. If n is specified, it has the same meaning as for -M<n>.
- --find-copies-harder
For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one -C option has the same effect.
- -D
- --irreversible-delete
Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and /dev/null. The resulting patch is not meant to be applied with patch nor git apply; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually, hence the name of the option.
When used together with -B, omit also the preimage in the deletion part of a delete/create pair.
- -l<num>
The -M and -C options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number.
- --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]
Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their type (i.e. regular file, symlink, submodule, ...) changed (T), are Unmerged (U), are Unknown (X), or have had their pairing Broken (B). Any combination of the filter characters (including none) can be used. When * (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.
- -S<string>
Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file. Intended for the scripter's use.
It is useful when you're looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into -S, and keep going until you get the very first version of the block.
- -G<regex>
Look for differences whose patch text contains added/removed lines that match <regex>.
To illustrate the difference between -S<regex> --pickaxe-regex and -G<regex>, consider a commit with the following diff in the same file:
+ return !regexec(regexp, two->ptr, 1, ®match, 0); ... - hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);
While git log -G"regexec\(regexp" will show this commit, git log -S"regexec\(regexp" --pickaxe-regex will not (because the number of occurrences of that string did not change).
See the pickaxe entry in gitdiffcore(7) for more information.
- --pickaxe-all
When -S or -G finds a change, show all the changes in that changeset, not just the files that contain the change in <string>.
- --pickaxe-regex
Treat the <string> given to -S as an extended POSIX regular expression to match.
- -O<orderfile>
Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line.
- -R
Swap two inputs; that is, show differences from index or on-disk file to tree contents.
- --relative[=<path>]
When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.
- -a
- --text
Treat all files as text.
- --ignore-space-at-eol
Ignore changes in whitespace at EOL.
- -b
- --ignore-space-change
Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.
- -w
- --ignore-all-space
Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.
- --ignore-blank-lines
Ignore changes whose lines are all blank.
- --inter-hunk-context=<lines>
Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.
- -W
- --function-context
Show whole surrounding functions of changes.
- --exit-code
Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences.
- --quiet
Disable all output of the program. Implies --exit-code.
- --ext-diff
Allow an external diff helper to be executed. If you set an external diff driver with gitattributes(5), you need to use this option with git-log(1) and friends.
- --no-ext-diff
Disallow external diff drivers.
- --textconv
- --no-textconv
Allow (or disallow) external text conversion filters to be run when comparing binary files. See gitattributes(5) for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for git-diff(1) and git-log(1), but not for git-format-patch(1) or diff plumbing commands.
- --ignore-submodules[=<when>]
Ignore changes to submodules in the diff generation. <when> can be either "none", "untracked", "dirty" or "all", which is the default. Using "none" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the ignore option in git-config(1) or gitmodules(5). When "untracked" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using "dirty" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using "all" hides all changes to submodules.
- --src-prefix=<prefix>
Show the given source prefix instead of "a/".
- --dst-prefix=<prefix>
Show the given destination prefix instead of "b/".
- --no-prefix
Do not show any source or destination prefix.
For more detailed explanation on these common options, see also gitdiffcore(7). <path>...:: The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them).
Raw output format
The raw output format from "git-diff-index", "git-diff-tree", "git-diff-files" and "git diff --raw" are very similar.
These commands all compare two sets of things; what is compared differs:
- git-diff-index <tree-ish>
compares the <tree-ish> and the files on the filesystem.
- git-diff-index --cached <tree-ish>
compares the <tree-ish> and the index.
- git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]
compares the trees named by the two arguments.
- git-diff-files [<pattern>...]
compares the index and the files on the filesystem.
The "git-diff-tree" command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file.
An output line is formatted this way:
in-place edit :100644 100644 bcd1234... 0123456... M file0 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3 create :000000<PHONE_NUMBER>000... 1234567... A file4 delete :100644<PHONE_NUMBER>567... 0000000... D file5 unmerged :000000<PHONE_NUMBER>000... 0000000... U file6
That is, from the left to the right:
a colon.
mode for "src"; 000000 if creation or unmerged.
a space.
mode for "dst"; 000000 if deletion or unmerged.
a space.
sha1 for "src"; 0{40} if creation or unmerged.
a space.
sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
a space.
status, followed by optional "score" number.
a tab or a NUL when -z option is used.
path for "src"
a tab or a NUL when -z option is used; only exists for C or R.
path for "dst"; only exists for C or R.
an LF or a NUL when -z option is used, to terminate the record.
Possible status letters are:
A: addition of a file
C: copy of a file into a new one
D: deletion of a file
M: modification of the contents or mode of a file
R: renaming of a file
T: change in the type of the file
U: file is unmerged (you must complete the merge before it can be committed)
X: "unknown" change type (most probably a bug, please report it)
Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or copy), and are the only ones to be so.
<sha1> is shown as all 0's if a file is new on the filesystem and it is out of sync with the index.
Example:
:100644 100644 5be4a4...... 000000...... M file.c
When -z option is not used, TAB, LF, and backslash characters in pathnames are represented as \t, \n, and \\, respectively.
diff format for merges
"git-diff-tree", "git-diff-files" and "git-diff --raw" can take -c or --cc option to generate diff output also for merge commits. The output differs from the format described above in the following way:
there is a colon for each parent
there are more "src" modes and "src" sha1
status is concatenated status characters for each parent
no optional "score" number
single path, only for "dst"
Example:
::100644<PHONE_NUMBER>44 fabadb8... cc95eb0... 4866510... MM describe.c
Note that combined diff lists only files which were modified from all parents.
Generating patches with -p
When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a -p option, "git diff" without the --raw option, or "git log" with the "-p" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.
What the -p option produces is slightly different from the traditional diff format:
It is preceded with a "git diff" header that looks like this:
diff --git a/file1 b/file2
The a/ and b/ filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, /dev/null is not used in place of the a/ or b/ filenames.
When rename/copy is involved, file1 and file2 show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively.
It is followed by one or more extended header lines:
old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>
File modes are printed as 6-digit octal numbers including the file type and file permission bits.
Path names in extended headers do not include the a/ and b/ prefixes.
The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one.
The index line includes the SHA-1 checksum before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode.
TAB, LF, double quote and backslash characters in pathnames are represented as \t, \n, \" and \\, respectively. If there is need for such substitution then the whole pathname is put in double quotes.
All the file1 files in the output refer to files before the commit, and all the file2 files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:
diff --git a/a b/b rename from a rename to b diff --git a/b b/a rename from b rename to a
combined diff format
Any diff-generating command can take the -c or --cc option to produce a combined diff when showing a merge. This is the default format when showing merges with git-diff(1) or git-show(1). Note also that you can give the `-m' option to any of these commands to force generation of diffs with individual parents of a merge.
A combined diff format looks like this:
diff --combined describe.c index fabadb8,cc95eb0..4866510 --- a/describe.c +++ b/describe.c @@@ -98,20 -98,12 +98,20 @@@ return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1; } - static void describe(char *arg) -static void describe(struct commit *cmit, int last_one) ++static void describe(char *arg, int last_one) { + unsigned char sha1[20]; + struct commit *cmit; struct commit_list *list; static int initialized = 0; struct commit_name *n; + if (get_sha1(arg, sha1) < 0) + usage(describe_usage); + cmit = lookup_commit_reference(sha1); + if (!cmit) + usage(describe_usage); + if (!initialized) { initialized = 1; for_each_ref(get_name);
It is preceded with a "git diff" header, that looks like this (when -c option is used):
diff --combined file
or like this (when --cc option is used):
diff --cc file
It is followed by one or more extended header lines (this example shows a merge with two parents):
index <hash>,<hash>..<hash> mode <mode>,<mode>..<mode> new file mode <mode> deleted file mode <mode>,<mode>
The mode <mode>,<mode>..<mode> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format.
It is followed by two-line from-file/to-file header
--- a/file +++ b/file
Similar to two-line header for traditional unified diff format, /dev/null is used to signal created or deleted files.
Chunk header format is modified to prevent people from accidentally feeding it to patch -p1. Combined diff format was created for review of merge commit changes, and was not meant for apply. The change is similar to the change in the extended index header:
@@@ <from-file-range> <from-file-range> <to-file-range> @@@
There are (number of parents + 1) @ characters in the chunk header for combined diff format.
Unlike the traditional unified diff format, which shows two files A and B with a single column that has - (minus -- appears in A but removed in B), + (plus -- missing in A but added to B), or " " (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it.
A - character in the column N means that the line appears in fileN but it does not appear in the result. A + character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent).
In the above example output, the function signature was changed from both files (hence two - removals from both file1 and file2, plus ++ to mean one line that was added does not appear in either file1 nor file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with +).
When shown by git diff-tree -c, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by git diff-files -c, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version").
other diff formats
The --summary option describes newly added, deleted, renamed and copied files. The --stat option adds diffstat(1) graph to the output. These options can be combined with other options, such as -p, and are meant for human consumption.
When showing a change that involves a rename or a copy, --stat output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves arch/i386/Makefile to arch/x86/Makefile while modifying 4 lines will be shown like this:
arch/{i386 => x86}/Makefile | 4 +--
The --numstat option gives the diffstat(1) information but is designed for easier machine consumption. An entry in --numstat output looks like this:
1 2 README 3 1 arch/{i386 => x86}/Makefile
That is, from left to right:
the number of added lines;
a tab;
the number of deleted lines;
a tab;
pathname (possibly with rename/copy information);
a newline.
When -z output option is in effect, the output is formatted this way:
1 2 README NUL 3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL
That is:
the number of added lines;
a tab;
the number of deleted lines;
a tab;
a NUL (only exists if renamed/copied);
pathname in preimage;
a NUL (only exists if renamed/copied);
pathname in postimage (only exists if renamed/copied);
a NUL.
The extra NUL before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to NUL would yield the pathname, but if that is NUL, the record will show two paths.
EXAMPLES
- Various ways to check your working tree
$ git diff <1> $ git diff --cached <2> $ git diff HEAD <3>
Changes in the working tree not yet staged for the next commit.
Changes between the index and your last commit; what you would be committing if you run "git commit" without "-a" option.
Changes in the working tree since your last commit; what you would be committing if you run "git commit -a"
- Comparing with arbitrary commits
$ git diff test <1> $ git diff HEAD -- ./test <2> $ git diff HEAD^ HEAD <3>
Instead of using the tip of the current branch, compare with the tip of "test" branch.
Instead of comparing with the tip of "test" branch, compare with the tip of the current branch, but limit the comparison to the file "test".

- Comparing branches
$ git diff topic master <1> $ git diff topic..master <2> $ git diff topic...master <3>
Changes between the tips of the topic and the master branches.
Same as above.
Changes that occurred on the master branch since when the topic branch was started off it.
- Limiting the diff output
$ git diff --diff-filter=MRC <1> $ git diff --name-status <2> $ git diff arch/i386 include/asm-i386 <3>
Show only modification, rename and copy, but not addition nor deletion.
Show only names and the nature of change, but not actual diff output.
Limit diff output to named subtrees.
- Munging the diff output
$ git diff --find-copies-harder -B -C <1> $ git diff -R <2>
Spend extra cycles to find renames, copies and complete rewrites (very expensive).
Output diff in reverse.
SEE ALSO
GIT
Part of the git(1) suite


Introduction
This is documentation for taskbar widget.
Options
| Option name and values | Description |
|---|---|
Option name:autoHide Default value: false Allowed values: false , true
|
Autohide is a feature that allows hiding of a taskbar when it's not needed. Taskbar will be visible when user moves mouse to the edge of the screen, or mouse hovers over a taskbar, or interaction is in progress (like draggable, resizable, or sortable), or when taskbar has an opened element (a menu, or the datepicker). Otherwise, taskbar will start hiding after a certain period of time, configured in durations.autoHideDelay option, with a animation length configured in durations.autoHideHide. When mouse pointer is moved to browser window edge, taskbar will start showing with an animation length configured in durations.autoHideShow.
Taskbar with
Related options:
Related events:
Related demo: |
Option name:buttons Default value: null Allowed values: null object |
This option holds custom buttons that can be inserted into the taskbar. Custom buttons can be hold in two containers: user buttons container and system buttons container. User buttons container is a container after start buttons container, but before window buttons container, and the system buttons container is the last one (looking from left—in horizontal taskbar, and looking from top—in vertical taskbars). This option only holds buttons config. Buttons order is configured in buttonsOrder and systemButtonsOrder options. Buttons can by configured only once, and then inserted or removed into both containers multiple times. Buttons can be changed after initialization. See related demo for details.
After buttons is first prepended, an It's recommended for this object keys not to be numeric.
Related options:
Related demo: |
Option name:buttonsOrder Default value: [] Allowed values: array of keys from buttons option |
Array of strings coresponding to keys in buttons option, or to the names of system buttons. See the default value of systemButtonsOrder for full list of system buttons. Buttons, both custom and system, present in this array will be visible. Buttons not present will not be visible.
Related options:
Related demo: |
Option name:buttonsTooltips Default value: false Allowed values: false true
|
Whether to show jQuery UI Tooltip on button's hover. This applies to start buttons, custom buttons, window buttons and system buttons. |
Option name:clock Default value: false Allowed values: false true
|
Native button that display current time.
Time format and clock tooltip date format is configured per language, using
Available formats for
Available formats for Clock can have datepicker, configured in clockShowDatepicker option. Clock is probably reduntant, but useful for application that are designed to be used in fullscreen mode.
Related options:
Related demo: |
Option name:clockShowDatepicker Default value: true Allowed values: false true
|
Whether to show datepicker when clock button is clicked. Setting this option to Datepicker has no real function other than presenting dates. |
Option name:debug Default value:
Allowed values: object with keys exactly as shown above |
This is a object holding settings for debug functionality. Every key in this object is responsible for a one type of messages. See detailed options for more information. It's recommended to have debug turned on in development mode. This way at least some problems can by identified early on.
Details:
Related event: |
Option name:debug.environment Default value: true Allowed values: false true
|
This option is responsible for debug messages related to environment. Things like missing jQuery plugins and missing stylesheets are in this category.
Related event: |
Option name:debug.options Default value: true Allowed values: false true
|
This option is responsible for debug related to options being passed to both taskbar and window instances. Things like invalid option values and unknown options and events will be reported when
Related event: |
Option name:debug.localization Default value: true Allowed values: false true
|
This option is responsible for reporting missing translations and missing languages. Have it on when you're using built-in internationalization capabilities to make sure translation are thorough.
Related event: |
Option name:draggable Default value: false Allowed values: false true "horizontal" "vertical" "orientation"
|
Whether a taskbar should be draggable. Taskbar cannot be dragged freely. It can be dropped only on main window edges. Other options, draggableBetweenEdges and dropOnExisting has effect on behaviour configured via this option.
Related options:
Related events:
Related demo: |
Option name:draggableBetweenEdges Default value: true Allowed values: false true
|
Whether a taskbar can be dragged along the current main window edge it's sticking to.
User will see difference beetwen
Related options:
Related events:
Related demo: |
Option name:dropOnExisting Default value: false Allowed values: false true
|
Whether a taskbar can be dropped on a windows edge that has a taskbar already. It's not recommended to set this option to
With this option set to
Related options: |
Option name:durations Default value:
Allowed values: object with keys exactly as shown above |
This is a object holding various animation durations. Every key in this object is responsible for duration of one particular animation. See detailed options for more information.
Note: Changing duration when animation is in progress will not change duration of this animation. This is the intended behaviour. If you need to end animation immediately, use show, or hide methods with a parameter
Details: |
Option name:durations.buttonsTooltipsHide Default value: true Allowed values: valid value for jQuery UI Tooltip's "hide" options false for no animation
|
|
Option name:durations.buttonsTooltipsShow Default value: true Allowed values: valid value for jQuery UI Tooltip's "show" options false for no animation
|
|
Option name:durations.autoHideDelay Default value: 1200 Allowed values: valid jQuery animation false for no animation
|
This is a delay between the last action that clears a taskbar for autohide and an actual autohide start.
Related demo: |
Option name:durations.autoHideHide Default value: "slow" Allowed values: valid jQuery animation false for no animation
|
This is a speed of autohide hidding.
Related method:
Related demo: |
Option name:durations.autoHideShow Default value: "fast" Allowed values: valid jQuery animation false for no animation
|
This is a speed of autohide showing.
Related method:
Related demo: |
Option name:fallbackLanguage Default value: "en" Allowed values: any key from localization option |
When looking for translations, first a dictionary for language passed in language option will be checked, but when this fails, this option will be used as language to search for translations. |
Option name:icons Default value:
Allowed values: object with keys exactly as shown above |
Details:
Related demos: |
Option name:icons.clock Default value: null Allowed values: valid jQuery icon value any custom class name that adds icon |
Icon for clock button.
This option will have no visible effect if clock option is set to |
Option name:icons.languageSelect Default value: null Allowed values: valid jQuery icon value any custom class name that adds icon |
Icon for languageSelect button.
This option will have no visible effect if languageSelect option is set to |
Option name:icons.menuWindowClose Default value: "ui-icon-closethick" Allowed values: valid jQuery icon value any custom class name that adds icon |
This icon will be used for window group menus close button.
Related demo: |
Option name:icons.minimizeAll Default value: "ui-icon-minusthick" Allowed values: valid jQuery icon value any custom class name that adds icon |
Icon for minimizeAll button.
This option will have no visible effect if minimizeAll option is set to |
Option name:icons.networkMonitorOffline Default value: "ui-icon-alert" Allowed values: valid jQuery icon value any custom class name that adds icon |
Icon for networkMonitor button, when current connection state is offline.
This option will have no visible effect if networkMonitor option is set to |
Option name:icons.networkMonitorOnline Default value: "ui-icon-signal" Allowed values: valid jQuery icon value any custom class name that adds icon |
Icon for networkMonitor button, when current connection state is online.
This option will have no visible effect if networkMonitor option is set to |
Option name:icons.startButton Default value: null Allowed values: valid jQuery icon value any custom class name that adds icon |
Icon for all start buttons in a taskbar. If this option is not
This option will have no visible effect if there are no start buttons, either none are prepended to taskbar, or startButtons option is set to |
Option name:icons.startButtonSet Default value: "ui-icon-circle-triangle" Allowed values: "ui-icon-arrow-1" "ui-icon-arrow-2" "ui-icon-arrowrefresh-1" "ui-icon-arrowreturn-1" "ui-icon-arrowreturnthick-1" "ui-icon-arrowstop-1" "ui-icon-arrowthick-1" "ui-icon-arrowthick-2" "ui-icon-arrowthickstop-1" "ui-icon-carat-1" "ui-icon-carat-2" "ui-icon-circle-triangle" "ui-icon-triangle-1" "ui-icon-triangle-2"
|
Icon set for all start buttons in a taskbar. This option will only be used if icons.startButtonSet is set to If this option is in effect, depending on taskbar edge, different icon will be used for start menus. Button arrow will always point toward the center of window.
Horizontal taskbar with horizontalStick set to
This option will have no visible effect if there are no start buttons, either none are prepended to taskbar, or startButtons option is set to |
Option name:icons.toggleFullscreenOff Default value: "ui-icon-arrow-4-diag" Allowed values: valid jQuery icon value any custom class name that adds icon |
Icon for toggleFullscreen button, when browser is not in fullscreen mode.
This option will have no visible effect if toggleFullscreen option is set to |
Option name:icons.toggleFullscreenOn Default value: "ui-icon-arrow-4-diag" Allowed values: valid jQuery icon value any custom class name that adds icon |
Icon for toggleFullscreen button, when browser is in fullscreen mode.
This option will have no visible effect if toggleFullscreen option is set to |
Option name:horizontalRowHeight Default value: "auto" Allowed values: "auto" (recommended)integer |
Total height, including borders, of a single taskbar row, when orientation is set to
It's recommended for this option to be set to
Related options: |
Option name:horizontalRows Default value: 1 Allowed values: integer |
Number of rows when orientation is set to
Related options: |
Option name:horizontalRowsMax Default value: 2 Allowed values: integer |
Maximum number of rows when orientation is set to This will have effect on resizable.
Related options: |
Option name:horizontalRowsMin Default value: 1 Allowed values: integer |
Minimum number of rows when orientation is set to This will have effect on resizable.
Related options: |
Option name:horizontalStick Default value: "bottom left" Allowed values: "bottom left" "bottom right" "top left" "top right"
|
Edges to which taskbar will stick when orientation is set to
This option will have no effect when horizontalWidth is set to
Related options:
Related demo: |
Option name:horizontalWidth Default value: "100%" Allowed values: percent, for example "80%" integer (for pixels) |
Taskbar width when in horizontal mode.
Percentage values (always as string, for example Integer value for this option is not recommended, because your users can have all the different screen resolution.
Related options:
Related demo: |
Option name:language Default value: "en" Allowed values: any key from localization option object |
Main language from which all translations will be taken. This language will be used for all taskbar translations and translation for all windows bound to this taskbar. Note: rebinding window to another taskbar via the taskbar window option changes it translations (like buttons or confirm close) to those of new taskbar.
Related options: |
Option name:languages Default value: [ "en" ] Allowed values: array containing some or all keys from localization option |
Languages available for languageSelect widget. Values in this array has to match keys in localization option object. Note: Having only one item in this array does not disable languageSelect option. Passing an empty array does, however.
Related options:
Related event: |
Option name:languageSelect Default value: false Allowed values: false true
|
System button that will let user change language to one of the languages passed in languages option.
Related options:
Related event:
Related demo: |
Option name:localization Default value: {} Allowed values: object |
This option hold all localizations. This option is extended by every language file added to Simone. See translations documentation for more details on how this works.
Related option:
Related event: |
Option name:menuAutoOpenOnBrowse Default value: true Allowed values: false true
|
When set to
When set to
Related demo: |
Option name:minimizeAll Default value: true Allowed values: false true
|
System button that allow to minimize all windows, and therefore exposing the viewport. Internally, clicking this button call minimizeAll method.
Related option:
Related method: |
Option name:minimizeAllHoverOpaqueWindows Default value: true Allowed values: false true
|
Setting this option to
Settings this option to Opacity used in this effect can be changed. Styling guide has a section regarding this.
Related demo: |
Option name:networkMonitor Default value: false Allowed values: false true
|
System button that is connected to browser
If Note: Some browsers implement an API that this button is using incorrectly. See this page for details.
Related demo: |
Option name:orientation Default value: "horizontal" Allowed values: "horizontal" "vertical"
|
Tells taskbar to stretch either horizontally or vertically. Horizontal taskbar will stretch on bottom or top edge of the main window. Vertical taskbar will strech on or right edge of the main window. Both settings implements some of the taskbar features differently. For example, horizontal taskbar with multiple rows will have buttons in each row, while vertical taskbar will always have button in one column. Window buttons on horizontal taskbar will be resized to fit their container, where on vertical taskbar a scrollbar will be used when there are too many buttons.
Related demo: |
Option name:propagateWindowBlur Default value: false Allowed values: false true
|
Whether window blur event should propagate to windows binded to taskbar, and blur the window being currently on top.
Related demo: |
Option name:resizable Default value: false Allowed values: false true
|
Determines if taskbar is resizable.
Taskbar cannot by resized freely. It can only be resized by a row, if orientation is set to Resizable is constrained by horizontalRowsMin and horizontalRowsMax options when taskbar is in horizontal mode, and by verticalColumnsMin and verticaColumnsMax options when taskbar is in vertical mode.
Related option:
Related demo: |
Option name:resizableHandleOverflow Default value: 2 Allowed values: integer |
How much pixels on each side will the resizable handle have. This value is also used for autoHide to define the space on which user can hover to start showing taskbar. It's recommended not to change this value, because it's optimal from UX point of view. Values >=4 would render windows that stick to a taskbar unresizable on the edge touching taskbar. Values lower than 1 are not supported and will be corrected to 1.
Related option: |
Option name:resolveCollisions Default value: true Allowed values: false true
|
Should the colliding taskbar be resized to not cover one another, or should no action be taken when taskbar overlap each other.
Related option: |
Option name:startButtons Default value: true Allowed values: false true
|
Whether or not start buttons should be visible. By default, taskbar has no start menus and they ought to be created. See related demo for code examples on how to build and manipulate start buttons and start menus.
Related demo: |
Option name:systemButtonsOrder Default value: [ "languageSelect",
"networkMonitor",
"toggleFullscreen",
"clock",
"minimizeAll" ] Allowed values: array containing system buttons names and optionally keys from buttons option |
Array of strings corresponding to keys in buttons option or to the names of system buttons. See the default value of this option for full list of system buttons. Buttons, both custom and system, present in this array will be visible. Buttons not present will not be visible.
Related options:
Related demos: |
Option name:toggleFullscreen Default value: false Allowed values: false true
|
Native button connected to browser fullscreen API.
If fullscreen API is not available in the browser, this button will not be shown, even if When this button is clicked by user (note: this action cannot be triggered programmatically), a fullscreen is requested (when browser is not in fullscreen mode), or fullscreen exit is requested (when browser is in fullscreen mode). Requesting fullscreen mode does not necessary means that browser will go fullscreen, and requesting fullscreen does not necessary means that browser will leave fullscreen. This button will also hold current fullscreen mode status. See this page for list of browsers implementing fullscreen API.
Related events:
Related demo: |
Option name:windowButtonsIconsOnly Default value: false Allowed values: false true
|
Should the window buttons have only icons, or should icons and labels by used on window buttons.
Related demo: |
Option name:verticalColumns Default value: 1 Allowed values: integer |
Number of columns when orientation is set to
Related options: |
Option name:verticalColumnsMax Default value: 2 Allowed values: integer |
Maximum number of columns when orientation is set to This will have effect on resizable.
Related options: |
Option name:verticalColumnsMin Default value: 1 Allowed values: integer |
Minimum number of columns when orientation is set to This will have effect on resizable.
Related options: |
Option name:verticalColumnWidth Default value: 100 Allowed values: percent, for example "10%" integer (for pixels) |
Total width, including borders, of a single taskbar column, when orientation is set to
Related options:
Related demo: |
Option name:verticalHeight Default value: "100%" Allowed values: percent, for example "80%" integer (for pixels) |
Taskbar height when in horizontal mode.
Percentage values (always as string, for example Integer value for this option is not recommended, because your users can have all the different screen resolutions.
Related options:
Related demo: |
Option name:verticalStick Default value: "top right" Allowed values: "bottom left" "bottom right" "top left" "top right"
|
Edges to which taskbar will stick when orientation is set to
This option will have no effect when verticalHeight is set to
Related options:
Related demo: |
Option name:viewportMargins Default value:
Allowed values: Object with structure as shown above |
This option is used for changing window containment size. By default, all space that's not taken by taskbars is available to windows. However, this space can be shrinked, for example, to make space for top bar or other elements on the page. This option is a object with four keys, one for every edge. Each edge is then an array with two values. First value is an integer, a pixel value of how much space on that edge should be taken from windows containment. Second values describes how should containment on that edge act in relation to taskbars on that edge. Four values are supported:
Related option:
Related demo: |
Option name:windowButtonsSortable Default value: true Allowed values: false true
|
Whether or not the taskbar window buttons are sortable by the user, using jQuery UI Sortable. Buttons are sortable within a single taskbar only.
Related demo: |
Option name:windowsContainment Default value: "viewport" Allowed values: "viewport" "visible"
|
Defines containment for all windows binded to taskbar. Two values are possible:
Related option:
Window widget will inherit it's containment from this option, if window's containment option is set to
Related demos: |
Option name:windowsInitialZIndex Default value: 100 Allowed values: integer |
Initial z-index of windows bound to taskbar. If you want to change this option's value and you have multiple taskbars on one page, it's highly recommended that you change value for all current and future instances at once, for example, by calling the following code:
Scenarios where taskbars does not have the save value of this option were not tested. Tip: to change taskbar's z-index, use CSS. |
Events
| Event name and UI object | Description |
|---|---|
Event name:every event Every UI object contains:
|
In addition to event-specific properties, every UI object contains
|
Event name:autoHideStart Cancelable: yes Example UI object (in addition to what every event UI object has):
|
Triggered when auto hide move starts. It is triggered when taskbar starts hiding and when taskbar starts showing. |
Event name:autoHideProgress Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when auto hide move is in progress. It is triggered when taskbar starts hiding and when taskbar starts showing. This event is triggered during animation, so it can trigger only once or twice, or not trigger at all. Don't put any crucial code inside this event—the kind that has to be executed—or put it again in autoHideStart or autoHideStop event handlers. |
Event name:autoHideStop Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when auto hide move stops. It is triggered when taskbar stops hiding and when taskbar stops showing. |
Event name:create Cancelable: no Example UI object (in addition to what every event UI object has):
|
This event if triggered when taskbar widget is successfully created. This event if triggered only once, when widget has been fully created. For refreshes of taskbar, refer to beforeRefresh and refresh events.
This event will not be triggered if widget creation failed. If that happens, set debug.environment to |
Event name:debugLogAdd Cancelable: yes Example UI object (in addition to what every event UI object has):
|
Triggered when message is added to debug log. When this event is cancelled, no message will be added to console. Setting any of debug object properties to false does not prevent this event, it does however prevent console output.
You can change error level (although it's not recommended, because
User's interactions with taskbar can trigger debug messages, for example, when user performs action that require the use of i18n, but language or key in dictionary is missing.
Related options: |
Event name:bind Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when window is bound to taskbar. |
Event name:unbind Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when window is unbound from taskbar. |
Event name:dragStart Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when taskbar draggable starts.
This event caries properties from Original draggable start event object is passed.
Related demo: |
Event name:drag Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when taskbar draggable in in progress.
This event caries properties from Original draggable drag event object is passed.
Related demo: |
Event name:dragStop Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when taskbar draggable stops.
This event caries properties from Original draggable stop event object is passed.
Related demo: |
Event name:beforeDrop Cancelable: yes Example UI object (in addition to what every event UI object has):
|
Triggered before taskbar draggable handler is dropped on droppable. If this event is canceled, taskbar will not be moved from it's original position. If this event is cancelled, drop event will not trigger for current drag. This event caries properties from jQuery UI Droppable drop event.
Related demo: |
Event name:drop Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered after taskbar draggable handler is dropped on droppable. This event will not be triggered if beforeDrop event was cancelled. This event caries properties from jQuery UI Droppable drop event.
Related demo: |
Event name:beforeDroppableOver Cancelable: yes Example UI object (in addition to what every event UI object has):
|
Triggered before draggable helper enters droppable area. If this event is canceled, taskbar droppable will not be highlighted. If this event is cancelled, droppableOver event will not trigger this time. This event caries properties from jQuery UI Droppable over event.
Related demo: |
Event name:droppableOver Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered after draggable helper enters droppable area. This event will not be triggered if beforeDroppableOver event was cancelled. This event caries properties from jQuery UI Droppable over event.
Related demo: |
Event name:beforeDroppableOut Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered before draggable helper leaves droppable area. This event caries properties from jQuery UI Droppable out event.
Related demo: |
Event name:droppableOut Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered after draggable helper leaves droppable area. This event caries properties from jQuery UI Droppable out event.
Related demo: |
Event name:elementOpen Cancelable: yes Example UI object (in addition to what every event UI object has):
|
Triggered when element, like start menu, or window group menu, or datepicker, is opened. When this event is cancelled, element will not be opened.
Related demo: |
Event name:elementClose Cancelable: yes Example UI object (in addition to what every event UI object has):
|
Triggered when element, like start menu, or window group menu, or datepicker, is closed. When this event is cancelled, element will not be closed.
Related demo: |
Event name:languageChange Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when taskbar language change.
Related demo: |
Event name:menuItemBlur Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when menu element from start menu, window group menu, or language select menu, is blurred.
Related demo: |
Event name:menuItemFocus Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when menu element from start menu, window group menu, or language select menu, is focused.
Related demo: |
Event name:beforeRefresh Cancelable: yes (although not recommended) Example UI object (in addition to what every event UI object has):
|
Triggered before full refresh is performed on a taskbar. This event can be triggered in many different scenarios, as full refresh is required by many option setters. Main window resize and other taskbar's collision resolving can trigger refresh too. This event is cancellable, but cancelling it is not recommended unless you're sure what you're doing.
Related method: |
Event name:refresh Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered after full refresh is performed on a taskbar. This event can be triggered in many different scenarios, as full refresh is required by many option setters. Main window resize and other taskbar's collision resolving can trigger refresh too.
Related method: |
Event name:beforeRequestFullscreen Cancelable: yes Example UI object (in addition to what every event UI object has):
|
Triggered before fullscreen enter or fullscreen leave is requested from the browser.
Current fullscreen state is stored in Note: there is no API method for entering and leaving fullscreen, because it cannot be triggered programmatically. |
Event name:requestFullscreen Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered after fullscreen enter or fullscreen leave is requested from the browser.
Current fullscreen state is stored in Note: there is no API method for entering and leaving fullscreen, because it cannot be triggered programmatically. |
Event name:resizeStart Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when taskbar resize starts.
This event caries properties from Original resizable start event object is passed. |
Event name:resize Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered during taskbar resize, when helper actually changes it size.
This event caries properties from Original resizable resize event object is passed. |
Event name:resizeStop Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when taskbar resize stops.
This event caries properties from Original resizable stop event object is passed. |
Event name:sortableStart Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when sortable starts.
Related demo: |
Event name:sortableSort Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when sortable is in progress.
Related demo: |
Event name:sortableChange Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when sortable items position changes.
Related demo: |
Event name:sortableStop Cancelable: no Example UI object (in addition to what every event UI object has):
|
Triggered when sortable stops.
Related demo: |
Methods
| Method name | Description |
|---|---|
Method name:blurWindows Parameters: none |
Blurs active window, regardless of taskbar it's bound to. |
Method name:button Parameter: jQuery object of window instance (mandatory) |
Returns button connected to a window instance passed in first parameter, or empty jQuery object if passed value was not a jQuery object of valid window instance. |
Method name:destroy Parameters: none |
Removes the taskbar functionality completely. This will return the element back to its pre-init state. |
Method name:hide Parameter: durations (optionally) |
Starts hidding taskbar, with an optional duration. If no duration is passed, current value of durations.autoHideHide is used. |
Method name:hideSubordinates Parameters: none |
Hides all subordinate elements of taskbar, like menus or datepicker. |
Method name:i18n Parameters: key (mandatory), values (optional), language (optional) |
Return string from dictionary, based on key. Optionally, a values can be passed as second parameter:
Assuming that Optionally, language can be passed as third parameter, so, assuming that current taskbar language is English, the following code:
will return |
Method name:instance Parameters: none |
Available since jQuery UI 1.11.
Retrieves the taskbar's instance object. If the element does not have an associated instance, instance() is safe to call on any element after the dialog plugin has loaded.
|
Method name:minimizeAll Parameters: none |
Minimizes all windows, of all taskbars.
Related option: |
Method name:option Parameters: option name (mandatory) option value (optional) |
Serves as getter or a setter for options. When only option name is passed, this method act as getter.
When option name and option value is passed, a new option value is set.
Alternatively, an object can be passed as option name, acting as a setter:
This will set both |
Method name:refresh Parameters: none |
Refreshes taskbar, rebuilding it in practice.
This method should be called after new menus are inserted into taskbar or after unused menus are removed. Adding or removing
Related events: |
Method name:show Parameter: durations (optionally) |
Start showing taskbar, with an optional duration. If no duration is passed, current value of durations.autoHideShow is used. |
Method name:taskbarSetup Parameters: options (mandatory) propagateToInstances (optional, passed as first parameter if used) |
Changes the default taskbar setup, and optionally propagate changes to existing taskbar instances. See related demo for details on usage.
Related demo: |
Method name:windows Parameters: none |
Returns all windows bound to taskbar.
This method return elements on which |
Method name:widget Parameters: none |
Returns element on which |


This blog is demo blog for Kiko Plus
This theme is inspired by Kiko theme, powered by Jekyll, hosted on Github Pages.
All configuration is done via _config.yml
file which you will find in your main repo folder. Change this <something>
to yours.
name: <blog-name>
url: "https://localhost:4000"
.url: "https://<your-name>.github.io"
baseurl: "/<branch-name>"
author:
is for links to icons in footer. Modify _includes/footer.html
to add more link icons.author:
name: your-name
facebook: your-id
twitter: your-id
github: your-id
linkedin: your-id
medium: your-id
tumblr: your-id
email<EMAIL_ADDRESS>google-analytics:
id: your-id
disqus:
id: your-id
$ rake post title="A Title" [date="2015-08-16"] [tags=[tag1,tag2]]
$ rake draft title="A Title" [date="2015-08-16"] [tags=[tag1,tag2]]
$ rake preview
This theme is released under MIT License.


Main Points from Stage 0: Getting Started with HTML
How the Web Works
The Web is a collection of HTML documents. The language of these documents is HTML (Hyper Text Markup Language). Software used to interpret these HTML documents into a format that is pleasing to users of the Web is called browsers.
HTTP (Hyper Text Transfer Protocol) is the protocol used by browsers to request information from servers, computers where HTML and associated files reside.
 These elements are further characterized by tags. Tags assign characteristics or attributes to elements. For example, there are tags that instruct brosers to display text in bold and italics. These tags can be combined and "layered" resulting in text that is both bold and italicized.
The bold tag in HTML looks like this:
[b] contents [/b]
where the brackets are replaced by the less than and greater than signs.
The emphasis tag, aka italicize tag, looks like this:
[em]contents[/em]
again, where the bracets are replaced by the less than and greater than signs.
HTML Attributes
Some HTML elements contain attributes or language that has a specific function like creating a hyperlink or displaying an image from a file. In general, the format of an HTML element that has an attribute looks like this:
[Tag Attr = "value"]contents[/tag]
where Tag is the tag name, Attr is the attribute name and value is substituted with a web address or file location among other values.
The anchor tag creates a hyperlink and the general format looks like this:
[a href = "www.udacity.com"]practice link[/a]
The img tag inserts an image from a file location. In general the format looks like this:
[img src = "url" alt="text"]
where img is the tag name, src is the attribute name, and url is the file location. The last part of the element is used by the browser to display text in case the URL is broken and no image is shown. The text that is displayed can also be used to describe the image and can be of benefit to the visually challenged.
Inline and Block elements
HTML elements are either inline or block. If they are block, then they have an "invisible block" around them. This is important for formating purposes and will be developed in future stages of this course.


Assignments
For each reading assignment, write one page describing your experienceAnswer this question: What is most important thing for you to say about this reading? Was the reading useless?
with the reading. Submit a reading response by creating a Google Document and sharing it with me. Title your document with the name of the class, your name, and the assignment number. For instance, Frank Zappa might use MAT201B Frank Zappa Assignment 4 as the title of his response to reading assignment 4.
For each programming assignment, submit your code by pushing it to your Github repository for this class. Unless the assignment specifies otherwise, submit your programming assignment solution as a single .cpp placed in a folder named assignment.
Assignment 5 | Due 2019-02-20 by 1700
No reading.
Submit a 2-page writen proposal, describing your final project as if it already exists. Include screenshots, diagrams, hand-drawn sketches, links to projects, videos and other media that insipires and/or informs your project. This is a writing assignment; Submit it as you would a reading response.
Develop a preliminary sketch (that means running c++ code) that demonstrates some aspect of your final project. Push this to code to your repo as you would for a programming homework. Be prepared to demonstrate this sketch in class on the 21st.
Assignment 4 | Due 2019-02-13 by 1700
Read/Skim chapters 5-7 of Designing Audio Effect Plug-Ins in C++ With Digital Audio Signal Processing Theory (Pirkle 2013). Pay particular attention to 1) the z-transform and simple filter designs that use it and 2) delays and circular buffers.
Read Karplus-Strong string synthesis and Karplus Strong Algorithm and implement Karplus-Strong:
- Implement the most-basic, barely-functional Karplus-Strong string you can. It does not have to change pitch; It does not even have to support tuning to arbitrary pitch. Make the implementation in the offline, UNIX way, like the other algorithms in the
unix/
folder. Name this solution string-p1.cpp. - Implement Karplus-Strong using allolib and the offerings in our synths.h header. Make sure this version supports triggering “plucks” and setting the fundamental frequency of the synth. Call this solution string-p2.cpp.
- Do your own thing. Name this code string-p3.cpp. Add or change some element of Karplus-Strong. For instance, use a different kind of filter, allow for dynamically changing the “listening position”, or introduce some sort of dynamic range compression to generate a “guitar feedback” sound.
To provide context for part 2, imagine this starter code:
#include "Gamma/SoundFile.h"
using namespace gam;
#include "al/core.hpp"
using namespace al;
#include "synths.h"
using namespace diy;
struct KarplusStrong {
// frequency
//
void pluck() {
// what to do here?
//
// when is this?
// what time context is this called in?
}
void frequency(float hertz) {
// do something
}
void decay(float seconds) {
// do something
}
//
float operator()() {
return 0; // this is wrong
//
}
};
struct OurApp : App {
Edge edge;
KarplusStrong string;
void onCreate() {
edge.period(1);
string.frequency(220);
}
void onSound(AudioIOData& io) override {
while (io()) {
if (edge()) {
string.pluck();
//
}
float f = string();
io.out(0) = f;
io.out(1) = f;
}
}
};
Assignment 3 | Due 2019-02-04 by 1700
Read chapter 9 of Numerical Sound Synthesis (Bilbao 2009) on acoustic tubes and chapter 4 of Real Sound Synthesis for Interactive Applications (Cook 2002) on modal synthesis.
Write a C++ program that executes a bandlimited impulse sweep. Copy the code below to a file named impulse-sweep.cpp and put it in the unix/
folder of the course repository.
#include "everything.h"
using namespace diy;
int main(int argc, char* argv[]) {
// calculate and output a bandlimited impulse whose
// frequency starts near Nyquist and ends near midi 0.
// make all calculations per-sample. determine the
// current frequency, the number of harmonics to use,
// and the current amplitude. increment phase.
// output a finite number of floats, one float per line
say(0.0); // use this function
// use other functions and constants from everything.h
}
Build and run this code on the terminal, execute the commands below:
cd path/to/MAT240B-2019
cd unix
make
./impulse-sweep.exe | ./write
open out.wav
Investigate the waveform and spectrum of the output file. Is it what you expect? If not, why not?
Next, modify the code to make a) a sawtooth (sawtooth-sweep.cpp
) and b) a square wave (square-sweep.cpp
).
Assignment 2 | Due 2019-01-28 by 1700
Read chapters 5 and 6 of Real Sound Synthesis for Interactive Applications (Cook 2002), Software for Spectral Analysis, Editing, and Synthesis (Klingbeil 2005), and …a comprehensive list of window functions… (Heinzel 2002). The concepts and practical information in these reading are critical to our next subject, analysis/resynthesis, so make sure to do these readings.
Write a C++ program named extract_links.cpp that uses std::regex
to identify and extract all the links from HTML given on the standard input. Each link has a name and a target. Print these as “name –> target” on the standard output in the order they are found. For instance, if we run our program on the SPEAR website:
c++ -std=c++11 extract_links.cpp -o extract_links
curl http://www.klingbeil.com/spear/ | ./extract_links
We might get this output on the terminal:
SPEAR home --> /spear/
help --> /spear/analysis.html
downloads --> /spear/downloads/
main --> /
vitae --> /cv.html
music --> /music.html
photos --> /photos/
links --> /connect.html
Click here to download --> downloads
Click here to download --> downloads
downloads --> downloads
downloads --> downloads
downloads --> downloads
Help page --> analysis.html
ICMC paper “Software for Spectral Analysis, Editing, and Synthesis.” --> /papers/spearfinal05.pdf
<i>Spectral Analysis, Editing, and Resynthesis: Methods and Applications</i> --> /data/Klingbeil_Dissertation_web.pdf
download page --> downloads/
SPEAR home --> /spear/
help --> /spear/analysis.html
downloads --> /spear/downloads/
main --> /
vitae --> /cv.html
music --> /music.html
photos --> /photos/
links --> /connect.html
Use this code to start:
#include <regex> // regex
#include <iostream>
using namespace std;
int main() {
while (true) {
string line;
getline(cin, line);
// do things
}
}
Read these: regex, “raw” string literal, match_results, Regular Expressions.
Assignment 1 | Due 2019-01-21 by 1700
With Chowning’s 1973 paper in mind, study Synthesis of Quasi-Bandlimited Analog Waveforms Using Frequency Modulation (Schoffhauzer 2005). This FM technique establishes parameters—Consider referring to parameterization. With Stilson’s 1996 paper in mindThis text on BLIT integration might help with understanding Stilson 1996.
, study Hard Sync Without Aliasing (Brandt 2001); How does this paper compare to Stilson’s? Finally, read chapters 1 and 2 of Numerical Sound Synthesis (Bilbao 2009).
Write a C++ program named word_histogram.cpp that calculates word frequency and produces a list of unique words, sorted by frequency (most frequent words first). Your program should read in plain-text files such as books found on Project Guttenberg. For instance, The Mysterious Stranger (for me) results in this output:
1649:the
926:to
854:of
802:a
714:was
548:in
548:he
513:it
429:that
425:I
372:not
344:for
324:we
303:his
298:is
294:with
289:had
285:but
277:you
237:were
195:as
192:him
182:her
178:be
177:have
172:they
169:He
169:would
...
To compile and execute the code and get this result printed to the terminal, we use a few commands on the terminal as well as redirection:
curl http://www.gutenberg.org/files/50109/50109-0.txt > The-Mysterious-Stranger.txt
c++ word_histogram.cpp -o word_histogram
./word_histogram < The-Mysterious-Stranger.txt
You will almost certainly need to refer to documentation these: pair, unorded_map, and sort. Start with the code below:
#include <algorithm> // sort
#include <iostream> // cin, cout, printf
#include <unordered_map> // unordered_map
#include <vector> // vector
using namespace std;
int main() {
unordered_map<string, unsigned> dictionary;
string word;
while (cin >> word) {
// put your counting code here
//
// use dictionary.find, dictionary.end, and dictionary[]
}
vector<pair<string, unsigned>> wordList;
for (auto& t : dictionary) wordList.push_back(t);
// put your sorting code here
//
// use the sort function
for (auto& t : wordList) printf("%u:%s\n", t.second, t.first.c_str());
}
Assignment 0 | Due 2019-01-14 by 1700
Read and study The Synthesis of Complex Audio Spectra by Means of Frequency Modulation (Chowning 1973) and Alias-Free Digital Synthesis of Classic Analog Waveforms (Stilson 1996)
Write a C++ program that accepts sentences typed on the terminal, printing each sentence with its words reversedReverse each word of the sentence individually. For instance: “this is the truth” becomes “siht si eht hturt”.
. You may start with the code below.
#include <iostream>
#include <string>
using namespace std;
int main() {
while (true) {
printf("Type a sentence (then hit return): ");
string line;
getline(cin, line);
if (!cin.good()) {
printf("Done\n");
return 0;
}
// put your code here
//
}
}
To submit this assignment, place your solution in a file named reverse_words.cpp and put the file in a folder named assignment in your github repository. See how to git for more information.


SWAP completed!<PHONE_NUMBER>-2838351482 {"uuid":"00c931a25c1a5e675048d39f076372bf9123261f3afbe1f31f7906cd9f8e80a7","expiration":1539937466,"tradeid":0,"requestid":2529049749,"quoteid":2838351482,"iambob":1,"Bgui":"nogui","Agui":"","gui":"nogui","bob":"VRSC","srcamount":32.54900323,"bobtxfee":0.00001000,"alice":"KMD"
and that although i don't really want to sell VRSC... put the orders up just because people are wining...


facebook
Create Account
Get Facebook for Android and browse faster.
Email or Phone
Password
Create New Account
Forgot Password?
Help Center


The covid19sf package provides a daily summary of the covid19 cases in San Francisco. The package includes the following datasets:
covid19sf_age
- Cases summarized by age groupcovid19sf_demo
- Cases summarized by date, transmission and case dispositioncovid19sf_gender
- Confirmed cases summarized by gendercovid19sf_geo
- Confirmed cases and deaths summarized by geographycovid19sf_homeless
- Confirmed cases by homelessnesscovid19sf_hospital
- Hospital capacity datacovid19sf_hospitalizations
- Hospitalizations datacovid19sf_housing
- Alternative housing sitescovid19sf_summary
- Cases summarized by date, transmission and case dispositioncovid19sf_test_loc
- Testing locationscovid19sf_tests
- Daily number of testsData soucre: San Francisco, Department of Public Health - Population Health Division through the San Francisco Opne Data protal website
# install.packages("devtools") devtools::install_github("RamiKrispin/covid19sf")
The ccovid19sf package provides different views for the covid19 cases in San Francisco. That includes case distribution by age, gender, race, etc. The following examples demonstrate some of the data use cases.
The covid19sf_age provides a daily summary of the cumulative positive cases by age group:
data(covid19sf_age) head(covid19sf_age) #> specimen_collection_date age_group new_confirmed_cases cumulative_confirmed_cases last_updated #> 1 2020-03-12 51-60 2 6 2020-11-13 14:15:03 #> 2 2020-03-13 51-60 3 9 2020-11-13 14:15:03 #> 3 2020-03-14 51-60 1 10 2020-11-13 14:15:03 #> 4 2020-03-15 51-60 0 10 2020-11-13 14:15:03 #> 5 2020-03-16 51-60 8 18 2020-11-13 14:15:03 #> 6 2020-03-17 51-60 3 21 2020-11-13 14:15:03
The following box-plot shows the distribution of the positive cases by age group:
library(plotly) covid19sf_age$age_group <- factor(covid19sf_age$age_group, levels = c("under 18", "18-30", "31-40", "41-50", "51-60", "61-70", "71-80","81+")) plot_ly(covid19sf_age, color = ~ age_group, y = ~ new_confirmed_cases, boxpoints = "all", jitter = 0.3, pointpos = -1.8, type = "box" ) %>% layout(title = "Case Dist. by Age Group", yaxis = list(title = "Number of Cases"), xaxis = list(title = "Source: San Francisco Department of Public Health"), legend = list(x = 0.9, y = 0.9))
Here is the overall distribution of cases by age group as of 2020-11-12:
library(dplyr) library(plotly) covid19sf_age %>% filter(specimen_collection_date == max(specimen_collection_date)) %>% plot_ly(values = ~ cumulative_confirmed_cases, labels = ~ age_group, type = "pie", textposition = 'inside', textinfo = 'label+percent', insidetextfont = list(color = '#FFFFFF'), hoverinfo = 'text', text = ~paste("Age Group:", age_group, "<br>", "Total:", cumulative_confirmed_cases)) %>% layout(title = "Total Cases Distribution by Age Group")
The covid19sf_tests provides a daily summary of the daily number of tests and their results (positive, negative, and indeterminate):
data(covid19sf_tests) head(covid19sf_tests) #> specimen_collection_date tests pos pct neg indeterminate last_updated #> 1 2020-02-28 2 0 0.00000000 2 0 2020-11-13 14:15:00 #> 2 2020-03-01 2 0 0.00000000 2 0 2020-11-13 14:15:00 #> 3 2020-03-02 2 0 0.00000000 2 0 2020-11-13 14:15:00 #> 4 2020-03-03 8 2 0.25000000 6 0 2020-11-13 14:15:00 #> 5 2020-03-04 12 0 0.00000000 12 0 2020-11-13 14:15:00 #> 6 2020-03-05 23 6 0.26086957 17 0 2020-11-13 14:15:00
The plot below shows the daily distribution of the results of the tests:
covid19sf_tests %>% plotly::plot_ly(x = ~ specimen_collection_date, y = ~ pos, name = "Positive", type = 'scatter', mode = 'none', stackgroup = 'one', fillcolor = "red") %>% plotly::add_trace(y = ~ neg, name = "Negative", fillcolor = "green") %>% plotly::add_trace(y = ~ indeterminate, name = "Indeterminate", fillcolor = "gray") %>% plotly::layout(title = "Tests Results Distribution", yaxis = list(title = "Tests Count"), xaxis = list(title = "Source: San Francisco Department of Public Health"), legend = list(x = 0.1, y = 0.9))
The covid19sf_demp dataset provides a daily summary of the covid19 positive cases by race and ethnicity:
data(covid19sf_demo) head(covid19sf_demo) #> specimen_collection_date race_ethnicity new_confirmed_cases cumulative_confirmed_cases last_updated #> 1 2020-05-19 Asian 0 312 2020-11-13 14:15:03 #> 2 2020-05-31 Asian 5 348 2020-11-13 14:15:03 #> 3 2020-06-01 Asian 5 353 2020-11-13 14:15:03 #> 4 2020-06-02 Asian 3 356 2020-11-13 14:15:03 #> 5 2020-06-03 Asian 2 358 2020-11-13 14:15:03 #> 6 2020-06-04 Asian 5 363 2020-11-13 14:15:03
Below is a plot of the cumulative positive cases by race and ethnicity:
covid19sf_demo %>% dplyr::arrange(specimen_collection_date) %>% plotly::plot_ly(x = ~ specimen_collection_date, y = ~ cumulative_confirmed_cases, # name = 'Cases', type = 'scatter', mode = 'none', color = ~race_ethnicity, stackgroup = 'one') %>% layout(title = "Total Cases Dist. by Race and Ethnicity", legend = list(x = 0.1, y = 0.9), yaxis = list(title = "Number of Cases", tickformat = ".0f"), xaxis = list(title = "Source: San Francisco Department of Public Health"))


{% extends "base.html" %} {% block body_classes %}simple-content{% endblock %} {% block base_content %}
Oops – we can't find what you're looking for.
If this error continues, please email us.


I am a software developer who enjoys writing code, problem solving, and collaborating with team members to find successful solutions to software problems! Check out my LinkedIn and GitHub pages by clicking the icons below.
React, Angular, HTML/CSS, JavaScript, Node, jQuery, SQL, Liquid Logic, Git, Bootstrap, NPM, Jira
When I am not working or hanging out with my family, I am doing something active or spending time with friends. I play soccer year-round and enjoy hiking and mountain biking when I can.
I love watching hockey and will always root for my hometeam, The Minnesota Wild! I love craft brewing and enjoy going to festivals to try out new brews. If you know of one I should try, let me know!


The information on this page is NOT an official record. Do not rely on the correctness or completeness of this information. Verify all information with the official record keeper. The information contained in this report is provided in compliance with the Oklahoma Open Records Act, 51 O.S. 24A.1. Use of this information is governed by this act, as well as other applicable state and federal laws.
| STATE OF OKLAHOMA, Plaintiff, v. SABRINA NICOLE WILSON, Defendant. |
No. CF-2018-14 (Criminal Felony) Filed: 01/02/2018 Closed: 03/28/2018 Judge: CF B Docket |
STATE OF OKLAHOMA,
Plaintiff
Tulsa County Sheriff's Department,
ARRESTING AGENCY
WILSON, SABRINA NICOLE,
Defendant
| Attorney | Represented Parties |
|---|---|
| TULSA COUNTY PUBLIC DEFENDER |
WILSON, SABRINA NICOLE |
| Event | Party | Docket | Reporter |
|---|---|---|---|
|
Wednesday, January 17, 2018 at 9:01 AM PRELIMINARY HEARING NO ISSUE (PUBLIC DEFENDER) |
WILSON, SABRINA NICOLE | Preliminary Hearing Docket | |
|
Wednesday, February 7, 2018 at 9:01 AM PRELIMINARY HEARING STC OF CIVIL COMM (PUBLIC DEFENDER) |
WILSON, SABRINA NICOLE | Preliminary Hearing Docket | |
|
Wednesday, March 21, 2018 at 9:01 AM PRELIMINARY HEARING NO ISSUE/REVIEW OF CIVIL COMMIT PROGRAM |
WILSON, SABRINA NICOLE | Preliminary Hearing Docket | |
|
Wednesday, March 28, 2018 at 9:01 AM PRELIMINARY HEARING REVIEW OF CIVIL COMMIT (PUBLIC DEFENDER) |
WILSON, SABRINA NICOLE | Preliminary Hearing Docket |
Parties appear only under the counts with which they were charged. For complete sentence information, see the court minute on the docket.
| Count # 1. |
Count as Filed:
ABOFF, ASSAULT & BATTERY UPON A DETENTION OFFICER,
in violation of 21 O.S. 649 B Date of Offense: 12/28/2017 |
| Party Name | Disposition Information | |
|---|---|---|
|
Disposed: DISMISSED,
03/28/2018.
Dismissed- Request of the State Count as Disposed: ASSAULT & BATTERY UPON A DETENTION OFFICER(ABOFF) Violation of 21 O.S. 649 B |
| Count # 2. |
Count as Filed:
ABOFF, ASSAULT & BATTERY UPON A DETENTION OFFICETR,
in violation of 21 O.S. 649 B Date of Offense: 12/28/2017 |
| Party Name | Disposition Information | |
|---|---|---|
|
Disposed: DISMISSED,
03/28/2018.
Dismissed- Request of the State Count as Disposed: ASSAULT & BATTERY UPON A DETENTION OFFICETR(ABOFF) Violation of 21 O.S. 649 B |
| Date | Code | Description | Count | Party | Amount |
|---|---|---|---|---|---|
|
|
|
CRIMINAL FELONY INITIAL FILING. Document Available at Court Clerk's Office |
1 | WILSON, SABRINA NICOLE | |
|
|
|
DEFENDANT SABRINA NICOLE WILSON WAS CHARGED WITH COUNT #1, ASSAULT & BATTERY UPON A DETENTION OFFICER IN VIOLATION OF 21 O.S. 649 B |
1 | WILSON, SABRINA NICOLE | |
|
|
|
DEFENDANT SABRINA NICOLE WILSON WAS CHARGED WITH COUNT #2, ASSAULT & BATTERY UPON A DETENTION OFFICETR IN VIOLATION OF 21 O.S. 649 B |
2 | WILSON, SABRINA NICOLE | |
|
|
|
OCIS HAS AUTOMATICALLY ASSIGNED JUDGE CF D DOCKET TO THIS CASE. |
|||
|
|
|
JUDGE DAWN MOODY: CASE REASSIGNED TO CF: B BASED ON CF-17-6443. |
WILSON, SABRINA NICOLE | ||
|
|
|
JUDGE DAWN MOODY: DEFENDANT PRESENT, IN CUSTODY AND PUBLIC DEFENDER APPOINTED AS COUNSEL OF RECORD. ARRAIGNMENT HELD. DEFENDANT WAIVES READING OF THE INFORMATION AND FURTHER TIME TO PLEAD. DEFENDANT ENTERS A PLEA OF NOT GUILTY. PRELIMINARY HEARING NO ISSUE SET FOR 1/17/18 @ 9AM IN ROOM 347. BOND $10,000.00 AGG BOND. DEFENDANT REMANDED TO CUSTODY. |
WILSON, SABRINA NICOLE | ||
|
|
|
DISTRICT ATTORNEY INSPECTION NOTIFICATION |
WILSON, SABRINA NICOLE | ||
|
|
|
TULSA COUNTY PUBLIC DEFENDER'S OFFICE INSPECTION REQUEST |
WILSON, SABRINA NICOLE | ||
|
|
|
PAUPER'S AFFIDAVIT |
WILSON, SABRINA NICOLE | ||
|
|
|
RETURN COMMITMENT |
WILSON, SABRINA NICOLE | ||
|
|
|
ORDER FOR REASSIGNMENT OF CRIMINAL DISTRICT JUDGE |
WILSON, SABRINA NICOLE | ||
|
|
|
AFFIDAVIT & FINDING OF PROBABLE CAUSE T.R.A.C.I.S. (ARRESTED) Document Available at Court Clerk's Office |
WILSON, SABRINA NICOLE | ||
|
|
|
JUDGE JAMES KEELEY: DEFENDANT PRESENT, IN CUSTODY AND REPRESENTED BY KASEY BALDWIN. STATE REPRESENTED BY SEAN WATERS. PRELIMINARY HEARING PASSED FOR STATUS OF CIVIL COMMITMENT TO 2/28/18 AT 9:00 AM ROOM 347. BOND TO REMAIN; DEFENDANT REMANDED TO CUSTODY. |
WILSON, SABRINA NICOLE | ||
|
|
|
ACKNOWLEDGEMENT OF RECEIPT OF DISCOVERY |
|||
|
|
|
JUDGE JAMES KEELEY: COURT RESETS STATUS OF CIVIL COMMITMENT TO 2/7/18 AT 9:00 AM ROOM 347 |
WILSON, SABRINA NICOLE | ||
|
|
|
JUDGE JAMES KEELEY: DEFENDANT PRESENT, IN CUSTODY, AND REPRESENTED BY KASEY BALDWIN PD. STATE REPRESENTED BY SEAN WATERS. PRELIMINARY HEARING/REVIEW PASSED TO 3-21-2018 @ 9 AM IN ROOM 347. PR BOND AUTHORIZED, RELEASE ISSUED, DEFENDANT APPEARANCE IS WAIVED AT NEXT COURT DATE IF DEFENDANT IS INCOMPLIANT WITH CIVIL COMMIT PROGRAM. . |
WILSON, SABRINA NICOLE | ||
|
|
|
RECOGNIZANCE BOND FOR WILSON, SABRINA NICOLE POSTED BY WILSON, SABRINA NICOLE, POSTED 02/08/2018 |
WILSON, SABRINA NICOLE | $ 35.00 | |
|
|
|
RETURN RELEASE |
WILSON, SABRINA NICOLE | ||
|
|
|
JUDGE JAMES KEELEY: DEFENDANT NOT PRESENT, BENCH WARRANT UNDER ADVISEMENT, AND REPRESENTED BY KASEY BALDWIN. STATE REPRESENTED BY MARY KNOPP. PRELIMINARY HEARING/REVIEW PASSED TO 3-28-2018 @ 9 AM IN ROOM 347. DEFENDANT'S APPEARANCE IS WAIVED AT NEXT COURT DATE IF DEFENDANT IS INCOMPLIANT WITH CIVIL COMMIT PROGRAM. |
WILSON, SABRINA NICOLE | ||
|
|
|
JUDGE JAMES KEELEY: DEFENDANT PRESENT, NOT IN CUSTODY AND REPRESENTED BY PUBLIC DEFENDER. STATE REPRESENTED BY MARY KNOPP. DSMISSED BY COURT, AT REQUEST OF STATE, COST TO STATE. BOND EXONERATED. |
1 | WILSON, SABRINA NICOLE |


Sonos API
Global Control
GET /lockvolumes
GET /unlockvolumes
GET /pauseall/{timeout in minutes (optional)}
GET /resumeall/{timeout in minutes (optional)}
GET /reindex
GET /sleep/{timeout in seconds or timestamp HH:MM:SS or off}
GET /preset/{JSON preset}
GET /preset/{predefined preset name}
Zone Control
GET /{zone name}/{action}[/{parameter}]
Actions
Playback
- play
- pause
- playpause toggles playing state
- trackseek/{seconds into song, i.e. 60 for 1:00, 120 for 2:00 etc.}
- next
- previous
Volume
- volume/{absolute volume}
- volume/{+ or -}{relative volume}
- groupVolume/{absolute volume}
- groupVolume/{+ or -}{relative volume}
- mute
- unmute
- groupMute
- groupUnmute
- togglemute
- lockvolumes
- unlockvolumes experimental enforce the volume that was selected when locking!
Playback Settings
- favorite
- playlist
- repeat/{on | off}
- shuffle/{on | off}
- crossfade/{on | off}
Queue
- queue
- clearqueue
- seek/{queue index}
Room Grouping
- add/{player name from existing zone, prefix with player you want to join}
- join/{player player to join in, prefix with player from current zone} (this is just the inverse of add)
- isolate
- ungroup (alias of isolate)
- leave (alias of isolate)
Other
- say
Internals
- state returns a json-representation of the current state of player


{% extends "base.html" %} {% block head%}
Select the test offer you want to submit to the AI System from the dropdown menu below.
|
probability of your offer being accepted
|
probability of getting the maximum possible gain from your specific RESPONDER
|
|
|
## %
|
## %
|


Introducing the unofficial
Showcase your GitHub repo's success with hotlinkable GitHub star, fork, or follow buttons. Available in two sizes with up-to-date counts.
Made by @martzcodes. Available on GitHub.
Inspired by the original (non-Angular) version by @mdo. Also on GitHub.
Uses @jasonaden1's ng-conf presentation... Also on GitHub.
Licensed Apache 2.
<ng-gh-star username="martzcodes" reponame="angular-github-buttons" count="true" size="large"></ng-gh-star>
<ng-gh-star username="martzcodes" reponame="angular-github-buttons" count="true" ></ng-gh-star>
<ng-gh-watch username="martzcodes" reponame="angular-github-buttons" count="true" size="large"></ng-gh-watch>
<ng-gh-watch username="martzcodes" reponame="angular-github-buttons" count="true" ></ng-gh-watch>
<ng-gh-fork username="martzcodes" reponame="angular-github-buttons" count="true" size="large"></ng-gh-fork>
<ng-gh-fork username="martzcodes" reponame="angular-github-buttons" count="true" ></ng-gh-fork>
<ng-gh-follow username="martzcodes" count="true" size="large"></ng-gh-follow>
<ng-gh-follow username="martzcodes" count="true" ></ng-gh-follow>
The unofficial Angular GitHub buttons are available on GitHub for downloading, forking, or contributing.
<3