From bee393f64dd77d0f41fce07a07de4c4592c0cab9 Mon Sep 17 00:00:00 2001 From: CyC2018 <1029579233@qq.com> Date: Mon, 9 Apr 2018 11:52:30 +0800 Subject: [PATCH] auto commit --- notes/Git.md | 2 +- notes/剑指 offer 题解.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/notes/Git.md b/notes/Git.md index d42f5848..1695faad 100644 --- a/notes/Git.md +++ b/notes/Git.md @@ -49,7 +49,7 @@ Git 版本库有一个称为 stage 的暂存区,还有自动创建的 master - git add files 把文件的修改添加到暂存区 - git commit 把暂存区的修改提交到当前分支,提交之后暂存区就被清空了 -- git reset -- files 使用当前分支上的修改覆盖暂缓区,用来撤销最后一次 git reset files +- git reset -- files 使用当前分支上的修改覆盖暂缓区,用来撤销最后一次 git add files - git checkout -- files 使用暂存区的修改覆盖工作目录,用来撤销本地修改

diff --git a/notes/剑指 offer 题解.md b/notes/剑指 offer 题解.md index 6d27553b..0681d87e 100644 --- a/notes/剑指 offer 题解.md +++ b/notes/剑指 offer 题解.md @@ -393,15 +393,15 @@ public void push(int node) { in.push(node); } -public int pop() throws Exception{ +public int pop() { if (out.isEmpty()) { while (!in.isEmpty()) { out.push(in.pop()); } - if (out.isEmpty()){ + } + if (out.isEmpty()){ throw new Exception("queue is empty"); } - } return out.pop(); } ```