diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-04-19 21:37:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-19 21:37:16 -0700 |
| commit | 7203bafa88ff0a4f8702b0eee38bc36d7e542a81 (patch) | |
| tree | 56df1189eed5ed0464d2d98c8ff6ae42e992ac54 /Documentation/gittutorial-2.txt | |
| parent | Merge branch 'lt/mailinfo-in-body-header-continuation' (diff) | |
| parent | diff-files: document --ours etc. (diff) | |
| download | tgif-7203bafa88ff0a4f8702b0eee38bc36d7e542a81.tar.xz | |
Merge branch 'ah/diff-files-ours-theirs-doc'
The diff options "--ours", "--theirs" exist for quite some time.
But so far they were not documented. Now they are.
* ah/diff-files-ours-theirs-doc:
diff-files: document --ours etc.
Diffstat (limited to 'Documentation/gittutorial-2.txt')
0 files changed, 0 insertions, 0 deletions