Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>edit: @wiswit has pointed to <a href="http://www.git-tower.com/learn/git/ebook/command-line/advanced-topics/diffs" rel="nofollow">this</a> good explanation.</p> <p><code>f2e4113</code> and <code>d4b9bfc</code> are file-indexes. With <code>git show f2e4113</code> you see the file before the commit and <code>git show d4b9bfc</code> shows the file after the commit.</p> <p>The <em>combined diff format</em> is in the git diff manual pages described.</p> <pre><code>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 &gt; 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) &lt; 0) + usage(describe_usage); + cmit = lookup_commit_reference(sha1); + if (!cmit) + usage(describe_usage); + if (!initialized) { initialized = 1; for_each_ref(get_name); 1. 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 2. It is followed by one or more extended header lines (this example shows a merge with two parents): index &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt; mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt; new file mode &lt;mode&gt; deleted file mode &lt;mode&gt;,&lt;mode&gt; The mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt; line appears only if at least one of the &lt;mode&gt; 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 &lt;tree-ish&gt; and are not used by combined diff format. 3. 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. 4. 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: @@@ &lt;from-file-range&gt; &lt;from-file-range&gt; &lt;to-file-range&gt; @@@ 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"). </code></pre>
    singulars
    1. This table or related slice is empty.
    1. POHow does "index f2e4113..d4b9bfc 100644" in git diff correspond to SHA1 ID in gitk?
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USsilvio
    1. USsilvio
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POHow does "index f2e4113..d4b9bfc 100644" in git diff correspond to SHA1 ID in gitk?
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTAcceptedByOriginator
    1. CONow, after understanding that it is a file index, I see this index in gitk aswell. It is also possible to search for it by using the lower search field. (Not the SHA1 ID field.) Thanks.
      singulars
      1. PO
      1. USfreefox
    2. COno problem :-) When this is the answere, please mark it as answer with a green sign. Thx!
      singulars
      1. PO
      1. USsilvio
    3. COThe diff in the original question is not a combined diff, just a regular git-style diff. The reason the `mode` is `100644` rather than `660` or `100660` is that git stores only one bit of file `rwx` modes, specifically, the `x` bit. The mode of a working copy is based on the stored bit plus the user's `umask` setting. The diff string is always just `100644` or `100755` (for a regular file).
      singulars
      1. PO
      1. UStorek
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload