StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
primarykey
Id
19085616
data
AcceptedAnswerId
0
AnswerCount
0
ClosedDate
CommentCount
0
CommunityOwnedDate
CreationDate
2013-09-30T02:29:50.330
FavoriteCount
0
LastActivityDate
2013-09-30T02:29:50.330
LastEditDate
LastEditorUserId
0
OwnerUserId
1256452
ParentId
19084880
PostTypeId
2
Score
0
ViewCount
0
LastEditorDisplayName
text
Body
Assuming what you mean is: <ul> <li>commit <code>M</code> is a merge commit with two (or more) parents (<code>M^</code> and <code>M^2</code> at least)</li> <li>the complete tree for <code>M</code> is <code>T</code></li> <li>you want to exclude from <code>T</code> any files that were not present in some parent(s)</li> </ul> then one straightforward method to do this is to start with the complete list <code>T</code>, and remove those files. Here's a script that does that, without too much magic in it I think. Lightly tested... <pre><code>#! /bin/sh PROG=$(basename $0) case $# in 1) user_arg="$1";; *) echo "usage: $PROG <commit>" >&2; exit 1;; esac # find full SHA1 of user-specified rev, plus all its parents args=$(git rev-list --no-walk --parents "$user_arg") || exit 1 set -- $args # omit this if you want to just list all files in a non-merge commit case $# in 1|2) echo "$PROG: $user_arg is not a merge commit" >&2; exit 1;; esac # make temp file TF=$(mktemp -t "$PROG") || exit 1 trap "rm -f $TF" 0 1 2 3 15 # save the SHA-1 of the commit, then toss that from arguments c=$1 shift # Now look at each parent: if the file was added between that # parent and commit $c, it was not in that parent, so it's not # "in common" across all parents to the final commit. Dump # such names into a "remove list". # # Remove duplicates from "remove" list. Turn result into series # of regexp's for "grep -v". We need to: # 1) protect any regexp metacharacters: turn . * ^ $ [ \ into # backslash-prefixed versions of same # 2) add ^ at front and $ at end. for parent do git diff-tree -r --name-only --diff-filter=A $parent $c done | sort -u | sed -e 's/[.*^$[\]/\\&/g' -e 's/.*/^&$/' > $TF # Now just run grep -v with that list, with input being the # output of the "master list" of files in commit $c. git ls-tree -r --name-only $c | grep -v -f $TF </code></pre> If you mean something else, the <code>--diff-filter</code> above is tunable.
Tags
Title
singulars
PostAcceptedAnswerId
1. This table or related slice is empty.
PostParentId
1. POhow to get a list of merged files in git?
 singulars
 PostTypePostTypeId
 PTQuestion
PostTypePostTypeId
1. PTAnswer
UserLastEditorUserId
1. This table or related slice is empty.
UserOwnerUserId
1. UStorek
plurals
PostLinksPostIdRelatedPostId
1. This table or related slice is empty.
PostLinksRelatedPostIdPostId
1. This table or related slice is empty.
PostsAcceptedAnswerId
1. This table or related slice is empty.
PostsParentIdCreationDate
1. This table or related slice is empty.
VotesPostIdCreationDate
1. This table or related slice is empty.
CommentsPostId
1. This table or related slice is empty.

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.