git

README.md

@@ -70,6 +70,11 @@
 - [this 和 super 关键字](docs/oo/this-super.md)
 - [final 关键字](docs/oo/final.md)
 - [instanceof 关键字](docs/oo/instanceof.md)
+- [方法重载和方法重写](docs/basic-extra-meal/override-overload.md)
+- [Java 到底是值传递还是引用传递](docs/basic-extra-meal/pass-by-value.md)
+- [Java的不可变对象](docs/basic-extra-meal/immutable.md)
+- [可变参数](docs/basic-extra-meal/varables.md)
+
 
 
 ### **字符串**
@@ -91,6 +96,7 @@
 - [初识集合框架](docs/collection/gailan.md)
 - [时间复杂度](docs/collection/big-o.md)
 - [ArrayList](docs/collection/arraylist.md)
+- [泛型](docs/basic-extra-meal/generic.md)
 - [LinkedList](docs/collection/linkedlist.md)
 - [ArrayList 重拳出击，把 LinkedList 干翻在地](docs/collection/list-war-1.md)
 - [被 ArrayList 锤了一拳后，LinkedList 很不服气](docs/collection/list-war-2.md)
@@ -100,7 +106,6 @@
 - [HashMap 的扩容机制](docs/collection/hashmap-resize.md)
 - [HashMap 的加载因子为什么是 0.75](docs/collection/hashmap-loadfactor.md)
 - [为什么 HashMap 是线程不安全的？](docs/collection/hashmap-thread-nosafe.md)
-- [HashMap 精选面试题（背诵版）](docs/collection/hashmap-interview.md)
 
 
 ### **异常处理**
@@ -126,29 +131,27 @@
 - [Java 默认的编码方式 Unicode](docs/basic-extra-meal/java-unicode.md)
 - [new Integer(18) 与 Integer.valueOf(18) 有什么区别](docs/basic-extra-meal/int-cache.md)
 - [自动拆箱与自动装箱](docs/basic-extra-meal/box.md)
-- [方法重载和方法重写](docs/basic-extra-meal/override-overload.md)
-- [Java 到底是值传递还是引用传递](docs/basic-extra-meal/pass-by-value.md)
 - [浅拷贝与深拷贝](docs/basic-extra-meal/deep-copy.md)
 - [为什么重写 equals 时必须重写 hashCode 方法](docs/basic-extra-meal/equals-hashcode.md)
 - [注解](docs/basic-extra-meal/annotation.md)
 - [枚举](docs/basic-extra-meal/enum.md)
 - [深入理解 Java 中的反射](docs/basic-extra-meal/fanshe.md)
-- [泛型](docs/basic-extra-meal/generic.md)
 - [Java 不能实现真正泛型的原因是什么？](docs/basic-extra-meal/true-generic.md)
 - [Java程序在编译期发生了什么](docs/basic-extra-meal/what-happen-when-javac.md)
-- [马蜂窝一面：Comparable和Comparator有什么区别？](docs/basic-extra-meal/comparable-omparator.md)
-- [手撸了一个Java的不可变对象，很哇塞！](docs/basic-extra-meal/immutable.md)
-- [从原理上搞懂可变参数，就靠它了](docs/basic-extra-meal/varables.md)
+- [Comparable和Comparator有什么区别？](docs/basic-extra-meal/comparable-omparator.md)
 
 ## Java 企业级开发
 
 ### **Maven**
 
-- [保姆级神器 Maven，再也不用担心项目构建搞崩了](docs/maven/maven.md)
+- [项目构建神器 Maven](docs/maven/maven.md)
 
 ### **Git**
 
 - [Git 的前世今生](docs/git/git-qiyuan.md)
+- [Git 的数据模型](docs/git/shujujiegou.md)
+- [Git 的内部实现](docs/git/neibushixian.md)
+- [常用 Git 命令清单](docs/git/mingling.md)
 
 ## Java 进阶
 
@@ -160,6 +163,11 @@
 
 - [JVM 是什么？](docs/jvm/what-is-jvm.md)
 
+## 八股文
+
+- [HashMap 精选面试题（背诵版）](docs/collection/hashmap-interview.md)
+
+
 # :paw_prints: 联系作者
 
 - **技术交流群**

_sidebar.md

@@ -3,41 +3,45 @@
 - [什么是 Java](docs/overview/what-is-java.md)
 - [Java 发展简史](docs/overview/java-history.md)
 - [Java 的优势](docs/overview/java-advantage.md)
-- [JDK 和 JRE 有什么区别](docs/overview/jdk-jre.md)
-- [安装集成开发环境 Intellij IDEA](docs/overview/idea.md)
-- [第一个 Java 程序：Hello World](docs/overview/hello-world.md)
+- [JDK 和 JRE](docs/overview/jdk-jre.md)
+- [安装 Intellij IDEA](docs/overview/idea.md)
+- [Hello World](docs/overview/hello-world.md)
 
 
 **Java 基础语法**
 
 - [基本数据类型](docs/basic-grammar/basic-data-type.md)
 - [流程控制](docs/basic-grammar/flow-control.md)
 - [运算符](docs/basic-grammar/operator.md)
-- [注释：代码的最强辅助](docs/basic-grammar/javadoc.md)
+- [注释](docs/basic-grammar/javadoc.md)
 
 **面向对象**
 
-- [什么是对象？什么是类](docs/oo/object-class.md)
+- [对象和类](docs/oo/object-class.md)
 - [变量](docs/oo/var.md)
 - [方法](docs/oo/method.md)
 - [构造方法](docs/oo/construct.md)
 - [代码初始化块](docs/oo/code-init.md)
 - [抽象类](docs/oo/java-abstract.md)
 - [接口](docs/oo/interface.md)
-- [static 关键字](docs/oo/static.md)
-- [this 和 super 关键字](docs/oo/this-super.md)
-- [final 关键字](docs/oo/final.md)
-- [instanceof 关键字](docs/oo/instanceof.md)
+- [static](docs/oo/static.md)
+- [this 和 super](docs/oo/this-super.md)
+- [final](docs/oo/final.md)
+- [instanceof](docs/oo/instanceof.md)
+- [方法重载和方法重写](docs/basic-extra-meal/override-overload.md)
+- [值传递和引用传递](docs/basic-extra-meal/pass-by-value.md)
+- [不可变对象](docs/basic-extra-meal/immutable.md)
+- [可变参数](docs/basic-extra-meal/varables.md)
 
 
 **字符串**
 
-- [String 为什么是不可变的](docs/string/immutable.md)
+- [初识String](docs/string/immutable.md)
 - [字符串常量池](docs/string/constant-pool.md)
-- [深入浅出 String.intern](docs/string/intern.md)
-- [如何比较两个字符串是否相等](docs/string/equals.md)
-- [如何拼接字符串](docs/string/join.md)
-- [如何拆分字符串](docs/string/split.md)
+- [String.intern](docs/string/intern.md)
+- [比较字符串](docs/string/equals.md)
+- [拼接字符串](docs/string/join.md)
+- [拆分字符串](docs/string/split.md)
 
 **数组**
 
@@ -49,16 +53,16 @@
 - [初识集合框架](docs/collection/gailan.md)
 - [时间复杂度](docs/collection/big-o.md)
 - [ArrayList](docs/collection/arraylist.md)
+- [泛型](docs/basic-extra-meal/generic.md)
 - [LinkedList](docs/collection/linkedlist.md)
-- [ArrayList 重拳出击，把 LinkedList 干翻在地](docs/collection/list-war-1.md)
-- [被 ArrayList 锤了一拳后，LinkedList 很不服气](docs/collection/list-war-2.md)
-- [海康威视一面：Iterator与Iterable有什么区别？](docs/collection/iterator-iterable.md)
-- [为什么阿里巴巴强制不要在 foreach 里执行删除操作](docs/collection/fail-fast.md)
+- [ArrayList和LinkedList](docs/collection/list-war-1.md)
+- [ArrayList和LinkedList第二战](docs/collection/list-war-2.md)
+- [Iterator与Iterable](docs/collection/iterator-iterable.md)
+- [为什么不要在 foreach 里执行删除操作](docs/collection/fail-fast.md)
 - [HashMap 的 hash 原理](docs/collection/hash.md)
 - [HashMap 的扩容机制](docs/collection/hashmap-resize.md)
 - [HashMap 的加载因子为什么是 0.75](docs/collection/hashmap-loadfactor.md)
 - [为什么 HashMap 是线程不安全的？](docs/collection/hashmap-thread-nosafe.md)
-- [HashMap 精选面试题（背诵版）](docs/collection/hashmap-interview.md)
 
 
 **异常处理**
@@ -81,40 +85,41 @@
 - [Java 中常用的 48 个关键字](docs/basic-extra-meal/48-keywords.md)
 - [Java 命名约定](docs/basic-extra-meal/java-naming.md)
 - [Java 默认的编码方式 Unicode](docs/basic-extra-meal/java-unicode.md)
-- [new Integer(18) 与 Integer.valueOf(18) 有什么区别](docs/basic-extra-meal/int-cache.md)
+- [new Integer(18) 与 Integer.valueOf(18) ](docs/basic-extra-meal/int-cache.md)
 - [自动拆箱与自动装箱](docs/basic-extra-meal/box.md)
-- [方法重载和方法重写](docs/basic-extra-meal/override-overload.md)
-- [Java 到底是值传递还是引用传递](docs/basic-extra-meal/pass-by-value.md)
 - [浅拷贝与深拷贝](docs/basic-extra-meal/deep-copy.md)
 - [为什么重写 equals 时必须重写 hashCode 方法](docs/basic-extra-meal/equals-hashcode.md)
 - [注解](docs/basic-extra-meal/annotation.md)
 - [枚举](docs/basic-extra-meal/enum.md)
 - [深入理解 Java 中的反射](docs/basic-extra-meal/fanshe.md)
-- [泛型](docs/basic-extra-meal/generic.md)
-- [Java 不能实现真正泛型的原因是什么？](docs/basic-extra-meal/true-generic.md)
+- [Java 不能实现真正泛型的原因](docs/basic-extra-meal/true-generic.md)
 - [Java程序在编译期发生了什么](docs/basic-extra-meal/what-happen-when-javac.md)
-- [马蜂窝一面：Comparable和Comparator有什么区别？](docs/basic-extra-meal/comparable-omparator.md)
-- [手撸了一个Java的不可变对象，很哇塞！](docs/basic-extra-meal/immutable.md)
-- [从原理上搞懂可变参数，就靠它了](docs/basic-extra-meal/varables.md)
-
+- [Comparable和Comparator](docs/basic-extra-meal/comparable-omparator.md)
 
 
 **Maven**
 
-- [保姆级神器 Maven，再也不用担心项目构建搞崩了](docs/maven/maven.md)
+- [项目构建神器 Maven](docs/maven/maven.md)
 
 
 **Git**
 
 - [Git 的前世今生](docs/git/git-qiyuan.md)
+- [Git 的数据模型](docs/git/shujujiegou.md)
+- [Git 的内部实现](docs/git/neibushixian.md)
+- [常用 Git 命令清单](docs/git/mingling.md)
 
 **Java IO**
 
 - [IO 流的分类和概述](docs/io/shangtou.md)
 
 **Java 虚拟机**
 
-- [JVM 是什么？](docs/jvm/what-is-jvm.md)
+- [初识JVM](docs/jvm/what-is-jvm.md)
+
+**八股文**
+
+- [HashMap](docs/collection/hashmap-interview.md)
 
 -  **其他：**