File tree Expand file tree Collapse file tree 2 files changed +4
-10
lines changed Expand file tree Collapse file tree 2 files changed +4
-10
lines changed Original file line number Diff line number Diff line change @@ -404,13 +404,7 @@ \subsection{Unstaging modifications}
404
404
\begin {frame }[fragile]
405
405
\subslidetitle
406
406
407
- The command \cmd {git reset} allows you to unstage a file:
408
-
409
- \ begin{lstlisting}
410
- $ (*\textcolor[HTML]{0000AA}{git reset AUTHORS}*)
411
- Unstaged changes after reset:
412
- M AUTHORS
413
- \end {lstlisting }
407
+ The command \cmd {git restore --staged} allows you to unstage a file.
414
408
415
409
\vspace {1em}
416
410
\centerline {\includegraphics {assets/diagrams/undo-staged}}
@@ -420,7 +414,7 @@ \subsection{Unstaging modifications}
420
414
\subsection {Resetting modifications }
421
415
\begin {frame }[fragile]
422
416
\subslidetitle
423
- After \cmd {git reset }, the modification is still there:
417
+ After \cmd {git restore --staged }, the modification is still there:
424
418
\ begin{lstlisting}
425
419
$ (*\textcolor[HTML]{0000AA}{git status}*)
426
420
On branch master
@@ -467,7 +461,7 @@ \subsection{Removing a file}
467
461
Your branch is ahead of 'origin/master' by 4 commit.
468
462
(use "git push" to publish your local commits)
469
463
Changes to be committed:
470
- (use "git reset HEAD <file>..." to unstage)
464
+ (use "git restore --stage <file>..." to unstage)
471
465
472
466
(*\textcolor[HTML]{00AA00}{deleted:}*) (*\textcolor[HTML]{00AA00}{test.file}*)
473
467
\end {lstlisting }
You can’t perform that action at this time.
0 commit comments