> > On Thu, May 07, 2015 at 06:13:23AM -0400, Robert P. J. Day wrote: > > > yet another question i should know the answer to but don't -- is > > > there a way to distinguish between the staged and unstaged changes in > > > a stash entry with "git stash show"? > > > On Thu, 7 May 2015, Alex Pilon wrote: > > git stash show -p? > On Thu, May 07, 2015 at 07:54:13AM -0400, Robert P. J. Day wrote: > but AFAICT, that shows only the *totality* of the stash -- both > staged and unstaged changes, no? i was wondering if there was a way to > display what was in each category separately. after all, that > information has to be stored *somewhere* since it can be processed > when applying the stash in the future.
So I staged something in my st repo, then stashed. You want to see
something like 0439e82b in the `git log --graph --patch --decorate
--all` output below, correct?
* commit 425756c8cbfcb7118719a7404f2e0608c52619e9 (refs/stash)
|\ Merge: 0ff8738 0439e82
| | Author: Alex Pilon <[email protected]>
| | Date: Fri May 8 09:44:52 2015 -0400
| |
| | WIP on alp: 0ff8738 Merge remote-tracking branch 'origin/master'
into alp
| |
| * commit 0439e82bf900da32416311333f8c9bf6b9bedfee
|/ Author: Alex Pilon <[email protected]>
| Date: Fri May 8 09:44:52 2015 -0400
|
| index on alp: 0ff8738 Merge remote-tracking branch 'origin/master'
into alp
|
| diff --git a/TODO b/TODO
| index 0c244db..8652fbd 100644
| --- a/TODO
| +++ b/TODO
| @@ -35,3 +35,7 @@ Scroll wheel as ^E/^Y vs scroll forward/back buffer.
| Shift-space?
| Don't truncate upon horizontal downsize?
| Reflow upon horizontal resize?
| +C-S-U like in Gtk+ programs to enter Unicode code points.
| +Pointer above/below terminal while selecting text results in scrolling.
| +Increase terminal window size on font resize
| +Dim colours?
|
* commit 0ff873846823bf2a700da5734970673ecd84abd9 (HEAD -> alp)
|\ Merge: a12adf9 ae1923d
| | Author: Alex Pilon <[email protected]>
| | Date: Thu May 7 18:07:22 2015 -0400
| |
| | Merge remote-tracking branch 'origin/master' into alp
| |
So that would be `git diff HEAD refs/stash^2`.
pgp6YXAq9nm36.pgp
Description: PGP signature
_______________________________________________ Linux mailing list [email protected] http://oclug.on.ca/mailman/listinfo/linux
