Skip to content

Commit 79f6e0c

Browse files
committed
git question
1 parent 464129f commit 79f6e0c

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ At the beginning, it was the repository with questions from Java interviews. Cur
6363
- [Java Date classes?](core.md#java-date-classes)
6464
- [Why Do Local Variables Used in Lambdas Have to Be Final or Effectively Final?](core.md#why-do-local-variables-used-in-lambdas-have-to-be-final-or-effectively-final)
6565
- [orElse() vs orElseGet() in Optional?](core.md#orelse-vs-orelseget-in-optional)
66-
- [How to filter list of objects using Stream API without .filter()?](#howto-filter-list-of-objects-using-stream-without-filter)
66+
- [How to filter list of objects using Stream API without .filter()?](core.md#howto-filter-list-of-objects-using-stream-without-filter)
6767

6868
## Collections
6969
- [What is the complexity for get in Hashmap?](collections.md#what-is-the-complexity-for-get-in-hashmap)
@@ -161,6 +161,7 @@ At the beginning, it was the repository with questions from Java interviews. Cur
161161
- [What is the difference between merge and rebase?](git.md#what-is-the-difference-between-merge-and-rebase)
162162
- [What is git reset?](git.md#what-is-git-reset)
163163
- [What is the difference between soft reset and hard reset?](git.md#what-is-the-difference-between-soft-reset-and-hard-reset)
164+
- [How to combine multiple commits into one prior to push?](git.md#how-to-combine-multiple-commits-into-one-prior-to-push)
164165

165166
## Maven
166167
- [What is the difference between Maven and Gradle?](maven.md#what-is-the-difference-between-maven-and-gradle)

core.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,5 @@ public static void main(String[] args) {
289289
.forEach(person -> System.out.println(person.getAge()));
290290
}
291291
```
292+
292293
[Home Page](README.md)

git.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
- [What is the difference between merge and rebase?](#what-is-the-difference-between-merge-and-rebase)
33
- [What is git reset?](#what-is-git-reset)
44
- [What is the difference between soft reset and hard reset?](#what-is-the-difference-between-soft-reset-and-hard-reset)
5+
- [How to combine multiple commits into one prior to push?](#how-to-combine-multiple-commits-into-one-prior-to-push)
56

67
## What is the difference between merge and rebase?
78
- Both commits D and E are still here, but we create merge commit M that inherits changes from both D and E. However, this creates diamond shape, which many people find very confusing.
@@ -22,4 +23,8 @@
2223
###### Relative links:
2324
- https://stackoverflow.com/questions/3528245/whats-the-difference-between-git-reset-mixed-soft-and-hard
2425

26+
## How to combine multiple commits into one prior to push?
27+
###### Relative links:
28+
- https://www.internalpointers.com/post/squash-commits-into-one-git
29+
2530
[Home Page](README.md)

0 commit comments

Comments
 (0)