Created
September 3, 2013 07:32
-
-
Save tfnico/6420722 to your computer and use it in GitHub Desktop.
different ways of looking at stashes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
➜ ~/projects/agnes/[master]>git stash show stash@\{0\} -p #tab completion works | |
diff --git a/readme.txt b/readme.txt | |
index 98d8a9a..41773d2 100644 | |
--- a/readme.txt | |
+++ b/readme.txt | |
@@ -31,7 +31,9 @@ Here's some random content: enzym | |
Here's some random content: stringybark | |
Here's some random content: supercrescence | |
Here's some random content: glanduligerous | |
-Here's some random content: uninternational | |
+Here is some diff | |
+Take that | |
+Here's a lot of random content: uninternational | |
Here's some random content: crazily | |
Here's some random content: superrefine | |
Here's some random content: capitulation | |
➜ ~/projects/agnes/[master]>git show stash@\{0\} #tab completion doesn't work | |
➜ ~/projects/agnes/[master]>git --no-pager show stash@\{0\} [viaboxx] [9:30:44] | |
commit f1f3ae1a6dd6a518c0c6bfc334b19f7fe472e695 | |
Merge: 9d349f5 57a0547 | |
Author: Thomas Ferris Nicolaisen <[email protected]> | |
Date: Tue Sep 3 09:30:16 2013 +0200 | |
WIP on master: 9d349f5 [maven-release-plugin] prepare for next development iteration | |
diff --cc readme.txt | |
index 98d8a9a,98d8a9a..41773d2 | |
--- a/readme.txt | |
+++ b/readme.txt | |
@@@ -31,7 -31,7 +31,9 @@@ Here's some random content: enzy | |
Here's some random content: stringybark | |
Here's some random content: supercrescence | |
Here's some random content: glanduligerous | |
--Here's some random content: uninternational | |
++Here is some diff | |
++Take that | |
++Here's a lot of random content: uninternational | |
Here's some random content: crazily | |
Here's some random content: superrefine | |
Here's some random content: capitulation | |
➜ ~/projects/agnes/[master]>git --version [viaboxx] [9:30:49] | |
git version 1.8.4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment