計算機科学のブログ

ほしい物リスト

Git - Looking Around: Investigating Your Git Repository - diff, target, source

Head First Git: A Learner’s Guide to Understanding Git from the Inside OutRaju Gandhi(著)、 O’Reilly Mediaの Chapter 5.(Looking Around: Investigating Your Git Repository)、SHARPEN YOUR PENCIL(249/680)の解答を求めてみる。

入出力結果(Terminal, Zsh)

% git diff spicy-version different-base 
diff --git a/saucy.md b/saucy.md
index 8d49c34..3f421be 100644
--- a/saucy.md
+++ b/saucy.md
@@ -1,13 +1,12 @@
-# Spicy Green Mean Machine
+# Call me Cilly
 
 ## Ingredients
-1/2 cup - Plain yogurt
+1/2 cup - Sour Cream
 3-4 cloves - Garlic
 2 cups - Chopped cilantro
 1/4 cup - Olive oil
 1/4 cup - Lime juice
-2 pinches - Salt
-2 - Jalapenos, deseeded
+1/2 pinch - Salt
 
 ## Instructions
-Add all ingredients to a blender. Mix until desired consistency.
+Add all ingredients to a blender. Mix until smooth.
%