StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<h2>Listing changed files</h2> <p>Since a rebase/merge can be time-consuming, it's best to avoid doing an unnecessary one. There are a variety of ways to see what's been changed, depending on what sort of information you need.</p> <p>If you're interested in knowing per commit what files have changed, I'd suggest <code>git-log</code>:</p> <pre><code>git log [--pretty=<format>] --name-only <common-branch>..<local-branch> </code></pre> <p>You can use the <code>--pretty</code> option to get the header information you need; <code><format></code> can be a variety of choices, including a custom string with fields - see the man page for more information.</p> <p>The <code>--name-only</code> option is actually being passed through to <code>git-diff</code>, so if you don't care about per-commit results, you can go straight to the source:</p> <pre><code>git diff --name-only <common-branch> <local-branch> </code></pre> <p>Note that the branches are specified differently for the two commands.</p> <p>You can apply this to the upstream changes as well, changing <code><local-branch></code> to <code><upstream-branch></code>, and end up with two lists of files. I'll leave it up to you to figure out how you want to compare them, though the -f option of grep can be handy...</p> <h2>Manual merges</h2> <p>Autocracy beat me to this. If you've done some smart processing based on output of <code>git-log</code> you could edit only the commits you saw had overlapping file changes. If you were merging rather than rebasing, you'd use the <code>--no-commit</code> option.</p> <p>See also the configuration section of the <code>git-merge</code> man page. You might want to set merge.conflictstyle to diff3, so that you can see the original text as well as the changes on either side.</p> <p>If you're really desperate to suppress all attempts at automatic conflict resolution, I believe you could plug in a dummy mergetool (via merge.tool and mergetool.cmd) that does nothing and returns failure.</p> <p>Having said all of this, I should also say that in my experience with git merges, I have seen plenty of conflicts but cannot remember a single incorrect automatic merge. I personally trust it's merging capabilities. Checking up on it after should really be plenty.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

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