Contributing to this translation requires agreeing to its contributor agreement.
Zen

Translation

English type: Labeled list
'git diff' [<options>] <commit>..<commit> [--] [<path>...]
62/580 · 58

Contributing to this translation requires agreeing to its contributor agreement.

English Polish Actions
'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]
 
This is to view the changes between two arbitrary <commit>.
 
If --merge-base is given, use the merge base of the two commits for the "before" side. `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`.
 
'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]
 
This form is to view the results of a merge commit. The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents. Convenient ways to produce the desired set of revisions are to use the suffixes `^@` and `^!`. If A is a merge commit, then `git diff A A^@`, `git diff A^!` and `git show A` all give the same combined diff.
 
'git diff' [<options>] <commit>..<commit> [--] [<path>...]
git difftool [<opcje>] [<zapis> [<zapis>]] [--] [<ścieżka>...]
This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary <commit>. If <commit> on one side is omitted, it will have the same effect as using HEAD instead.
 
'git diff' [<options>] <commit>\...<commit> [--] [<path>...]
git difftool [<opcje>] [<zapis> [<zapis>]] [--] [<ścieżka>...]
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 you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>. A tree of interest is the one pointed to by the ref named `AUTO_MERGE`, which is written by the 'ort' merge strategy upon hitting merge conflicts (see linkgit:git-merge[1]). Comparing the working tree with `AUTO_MERGE` shows changes you've made so far to resolve textual conflicts (see the examples below).
 
For a more complete list of ways to spell <commit>, see "SPECIFYING REVISIONS" section in linkgit: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 linkgit:gitrevisions[7].
 

Loading…

User avatar None

String updated in the repository

  1. Git Manpages
  2. Translations
  3. Polish
'git diff' [<options>] <commit>..<commit> [--] [<path>...]
git difftool [<opcje>] [<zapis> [<zapis>]] [--] [<ścieżka>...]
3 months ago
User avatar None

String updated in the repository

  1. Git Manpages
  2. Translations
  3. Polish
'git diff' [<options>] <commit>..<commit> [--] [<path>...]
git difftool [<opcje>] [<zapis> [<zapis>]] [--] [<ścieżka>...]
4 months ago
User avatar None

String updated in the repository

  1. Git Manpages
  2. Translations
  3. Polish
'git diff' [<options>] <commit>..<commit> [--] [<path>...]
git difftool [<opcje>] [<zapis> [<zapis>]] [--] [<ścieżka>...]
a year ago
User avatar None

String updated in the repository

  1. Git Manpages
  2. Translations
  3. Polish
'git diff' [<options>] <commit>..<commit> [--] [<path>...]
git difftool [<opcje>] [<zapis> [<zapis>]] [--] [<ścieżka>...]
a year ago
Browse all string changes

Things to check

Consecutive duplicated words

Text contains the same word twice in a row: <zapis>

Reset

Glossary

English Polish
<commit> Git Manpages
<options> Git Manpages
<path> Git Manpages
commit Git Manpages
Git Git Manpages

String information

Source string description
type: Labeled list
Flags
ignore-ellipsis, no-wrap, priority:280
Source string location
en/git-diff.txt:87
String age
5 years ago
Last updated
3 months ago
Source string age
5 years ago
Translation file
po/documentation.pl.po, string 3568