計算機科学のブログ

ほしい物リスト

Git - GitHub - Searching Git Repositories - Git a Grep - subcommand, log, flag, patch, search, word-diff

Head First Git: A Learner’s Guide to Understanding Git from the Inside OutRaju Gandhi(著)、 O’Reilly Mediaの Chapter 7.(Searching Git Repositories: Git a Grep)、EXERCISE(554/680)の解答を求めてみる。

入出力結果(Terminal, Zsh)

gitanjali-aref-wedding-plans % git log -p       
commit 7886bce9d9a0fde936ef4696a41d14f89f5b4c18 (HEAD -> master, origin/master, origin/HEAD)
Author: Armstrong <armstrong@eventplannerz.com>
Date:   Mon Jul 26 20:36:10 2021 -0400

    add two more appetizers

diff --git a/appetizers.md b/appetizers.md
index c963726..fcbb433 100644
--- a/appetizers.md
+++ b/appetizers.md
@@ -3,3 +3,5 @@
 * Herb-sprinkled stuffed mushrooms
 * Blinnis with spiced fruit chutney
 * Mini grilled cheese sandwiches
+* Housemade sweet-potato chips topped with French onion dip
+* Jackfruit cakes with Old Bay aioli

commit 0b90575defe5f7c9d4783d5bcbdb9512ed48897f
Author: Trinity <trinity@eventplannerz.com>
Date:   Sun Jul 25 08:30:44 2021 -0400

    offer nonalcoholic options
gitanjali-aref-wedding-plans % git log -p --oneline
7886bce (HEAD -> master, origin/master, origin/HEAD) add two more appetizers
diff --git a/appetizers.md b/appetizers.md
index c963726..fcbb433 100644
--- a/appetizers.md
+++ b/appetizers.md
@@ -3,3 +3,5 @@
 * Herb-sprinkled stuffed mushrooms
 * Blinnis with spiced fruit chutney
 * Mini grilled cheese sandwiches
+* Housemade sweet-potato chips topped with French onion dip
+* Jackfruit cakes with Old Bay aioli
0b90575 offer nonalcoholic options
diff --git a/drinks.md b/drinks.md
index 93c7e91..3b31f11 100644
--- a/drinks.md
+++ b/drinks.md
@@ -6,3 +6,5 @@
   Champagne meets apple cider, garnished with a cinnamon-sugar rim
 * The Log Cabin: 
   Apple brandy and maple syrup will take you on an autumn trip through our favorite couple’s history
+
+**Nonalcoholic substitutes for all spirits are available upon request.**
gitanjali-aref-wedding-plans % git log -p --oneline --all
7886bce (HEAD -> master, origin/master, origin/HEAD) add two more appetizers
diff --git a/appetizers.md b/appetizers.md
index c963726..fcbb433 100644
--- a/appetizers.md
+++ b/appetizers.md
@@ -3,3 +3,5 @@
 * Herb-sprinkled stuffed mushrooms
 * Blinnis with spiced fruit chutney
 * Mini grilled cheese sandwiches
+* Housemade sweet-potato chips topped with French onion dip
+* Jackfruit cakes with Old Bay aioli
0b90575 offer nonalcoholic options
diff --git a/drinks.md b/drinks.md
index 93c7e91..3b31f11 100644
--- a/drinks.md
+++ b/drinks.md
@@ -6,3 +6,5 @@
   Champagne meets apple cider, garnished with a cinnamon-sugar rim
 * The Log Cabin: 
   Apple brandy and maple syrup will take you on an autumn trip through our favorite couple’s history
+
+**Nonalcoholic substitutes for all spirits are available upon request.**
gitanjali-aref-wedding-plans % git log -p --oneline --all --graph
* 7886bce (HEAD -> master, origin/master, origin/HEAD) add two more appetizers
| diff --git a/appetizers.md b/appetizers.md
| index c963726..fcbb433 100644
| --- a/appetizers.md
| +++ b/appetizers.md
| @@ -3,3 +3,5 @@
|  * Herb-sprinkled stuffed mushrooms
|  * Blinnis with spiced fruit chutney
|  * Mini grilled cheese sandwiches
| +* Housemade sweet-potato chips topped with French onion dip
| +* Jackfruit cakes with Old Bay aioli
* 0b90575 offer nonalcoholic options
| diff --git a/drinks.md b/drinks.md
| index 93c7e91..3b31f11 100644
| --- a/drinks.md
| +++ b/drinks.md
| @@ -6,3 +6,5 @@
|    Champagne meets apple cider, garnished with a cinnamon-sugar rim
|  * The Log Cabin: 
|    Apple brandy and maple syrup will take you on an autumn trip through our favorite couple’s history
| +
| +**Nonalcoholic substitutes for all spirits are available upon request.**
gitanjali-aref-wedding-plans % git log -p --oneline --all --graph -S walnut
...
* e9beff3 remove nuts from all items due to allergy concerns
| diff --git a/dinner.md b/dinner.md
| index 64c1f6e..df5fde0 100644
| --- a/dinner.md
| +++ b/dinner.md
| @@ -10,7 +10,7 @@
|  
|  ## Second course
|  
| -* Baked kabocha squash with sunflower-walnut stuffing served with roasted cauliflower and potatoes
| +* Baked kabocha squash with herbed ciabatta stuffing served with roasted cauliflower and potatoes
|  
|  **or**
|  
| @@ -22,4 +22,4 @@
|  
|  **or**
|  
| -* Almond-raspberry tart
| +* Raspberry tart
gitanjali-aref-wedding-plans % git log -p --oneline --all --graph -S walnut --word-diff
...
* e9beff3 remove nuts from all items due to allergy concerns
| diff --git a/dinner.md b/dinner.md
| index 64c1f6e..df5fde0 100644
| --- a/dinner.md
| +++ b/dinner.md
| @@ -10,7 +10,7 @@
| 
| ## Second course
| 
| * Baked kabocha squash with [-sunflower-walnut-]{+herbed ciabatta+} stuffing served with roasted cauliflower and potatoes
| 
| **or**
| 
| @@ -22,4 +22,4 @@
| 
| **or**
| 
| * [-Almond-raspberry-]{+Raspberry+} tart
* b6c8c82 replace meat dishes with vegetarian items
| diff --git a/dinner.md b/dinner.md
| index 10d16ca..64c1f6e 100644
| --- a/dinner.md
| +++ b/dinner.md
| @@ -10,11 +10,11 @@
| 
| ## Second course
| 
| * Baked [-Scottish salmon-]{+kabocha squash+} with [-garlic crumb topping,-]{+sunflower-walnut stuffing+} served with roasted cauliflower and potatoes
| 
| **or**
| 
| * [-Beef tenderloin-]{+Rigatoni pasta+} with [-horseradish-]{+marinara+} sauce, served with [-a loaded baked potato-]{+garlic bread+} and green beans 
| 
| ## Dessert
| 
gitanjali-aref-wedding-plans %