Working with git locally. -

Figure 376. Initialize git project

git init
Result: Sub folder .git containing project's metadata and versioning history

Figure 377. Configure author related data.

git config --global user.email "foo@company.com"
git config --global user.name "Helen Foo"

Figure 378. Adding resources to project index and staging area

public class Math {

  static public int add(
   final int a, final int b) {
     return a + b;
  }
}

git status: Math.java yet unversioned.
git add Math.java
git status: Math.java became versioned.

Figure 379. Committing change set

git commit --message "New math class containing single method"
Result: Commit change set to repository adding given message to project log.

Figure 380. Project versioning status

git status
On branch master ❶

No commits yet ❷

Untracked files: ❸
  (use "git add <file>..." to include in what will be committed)

    Math.java

nothing added to commit but untracked files present (use "git add" to track) ❹

❶	Our project currently has got only one branch. See `basic branching` for further details on possible project branches.
❷	Committing resources is an active task. We have not yet performed any commit.
❸	We have added a file `Math.java` to our project's main folder but it has not (yet) been added to git versioning.
❹	Friendly hint how to proceed.

Figure 381. Adding a comment

public class Math {

  static public int add(
   final int a, final int b) {
     return a + b;
  }
}

public class Math {
 /**
  * Summing two int values.
  * @param a first value.
  * @param b second value.
  * @return The sum of both.
  */
  static public int add(
   final int a, final int b) {
     return a + b;
  }
}

Figure 382. git diff tracing changes

Figure 383. Reverting individual file.

>git checkout -- ❶ Math.java ❷

>git diff Math.java ❸
>

❶	Double dashes '--' disambiguating branch names from file names.

❷	Replace working tree file `Math.java` by repository `master`.

❸	No difference working tree to `master` branch.

Figure 384. Compiling, Math.class and Print.class.

> javac Print.java Math.java  # Compilation creating Math.class and Print.class
 
> git status
On branch master
Your branch is up to date with 'origin/master'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        Math.class
        Print.class

nothing added to commit but untracked files present (use "git add" to track)

Figure 385. Math.class, Print.class and versioning.

Math.class and Print.class are being generated from Math.java and Print.java.
Rule of thumb: Do not version dependent objects.

Solution: Add a .gitignore file to versioning to contain:

# ignore generated .class files
*.class

Figure 386. Show project's log

git log
commit 0137ccd857a242f4751e36bdbce365c6130c3a32 ❶(HEAD -> master) 
Author: Martin Goik <goik@hdm-stuttgart.de>
Date:   Sat May 25 11:56:00 2019 +0200

    Removing duplicate headline ❷

commit 7f119fac36e02e4c5a7f04f022217b6f744d6e1d ❸
Author: Martin Goik <goik@hdm-stuttgart.de>
Date:   Sat May 25 11:49:52 2019 +0200

    Project Readme.md ❹ ...

❶	Latest commit among with its hash value.
❷	Latest commit message.
❸	Previous commit among with its hash value.
❹	Previous commit message.

Figure 387. Switch to an older revision ...

git checkout 7f119fac36e02e4c5a7f04f022217b6f744d6e1d
Note: checking out '7f119fac36e02e4c5a7f04f022217b6f744d6e1d'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD is now at 7f119fa Project Readme.md

Figure 388. ... and forth to current master's HEAD

git checkout master
Previous HEAD position was 7f119fa Project Readme.md
Switched to branch 'master'

Prev	Up	Next
Using git	Home	Shared development with centralized remote.

Using git

Working with git locally.

git local, DIY