summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-14 14:05:47 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-14 14:05:47 -0800
commit5e389c430d232e8b1a16e7357596328985111eab (patch)
treecec4f0c0e6281c537798c61be9127d0ee0ac9175 /xdiff-interface.c
parent55571f7861b81b033b378f3abe145ecbdbc1fdb6 (diff)
parenta9ee9bf9f9840498f2369ebafe6c220deb4327fd (diff)
downloadgit-5e389c430d232e8b1a16e7357596328985111eab.tar.gz
Merge branch 'jc/stash-create'
* 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"
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions