Skip to content

Add section about comparing changes to the git bootcamp #795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zware merged 6 commits into from
Jan 26, 2022
Merged

Add section about comparing changes to the git bootcamp #795

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be3338b
Document git diff tricks
Jan 21, 2022
f1e48db
Syntax fix
Jan 21, 2022
8127cc5
Mention .gitattributes and add links to git docs
Jan 26, 2022
f1f3ad4
Fix links
Jan 26, 2022
89ff956
Fix single backticks
Jan 26, 2022
ee7cb56
Update gitbootcamp.rst
Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions gitbootcamp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,32 @@ Commit the files:

git commit -m "<message>"

.. _diff-changes:

Comparing Changes
-----------------

View all non-commited changes::

git diff

Compare to the ``main`` branch::

git diff main

Exclude generated files from diff using an ``attr``
`pathspec <https://git-scm.com/docs/gitglossary#def_pathspec>`_ (note the
single quotes)::

git diff main ':(attr:!generated)'

Exclude generated files from diff by default::

git config diff.generated.binary true

The ``generated`` `attribute <https://git-scm.com/docs/gitattributes>`_ is
defined in :file:`.gitattributes`, found in the repository root.

.. _push-changes:

Pushing Changes
Expand Down