![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Nov 2007 22:05:47 +0000 (14:05 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Nov 2007 22:05:47 +0000 (14:05 -0800) |
* jc/stash-create:
git-stash: Fix listing stashes
git-merge: no reason to use cpio anymore
Revert "rebase: allow starting from a dirty tree."
rebase: allow starting from a dirty tree.
stash: implement "stash create"
git-stash: Fix listing stashes
git-merge: no reason to use cpio anymore
Revert "rebase: allow starting from a dirty tree."
rebase: allow starting from a dirty tree.
stash: implement "stash create"
| 1 | 2 | |||
|---|---|---|---|---|
| git-merge.sh | patch | | diff1 | | diff2 | | blob | history |
| git-stash.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-merge.sh
Simple merge
diff --cc git-stash.sh
Simple merge