diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-06-25 23:03:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 23:03:27 -0700 |
commit | 351d06df519ee405a1926e0c6ee34d6a1dba6b46 (patch) | |
tree | 10b8b7571b43748a993d2aa5d5eba2d1801c0ff1 /t/t6033-merge-crlf.sh | |
parent | Merge branch 'cb/array-size' into maint (diff) | |
parent | Revert "stash: require a clean index to apply" (diff) | |
download | tgif-351d06df519ee405a1926e0c6ee34d6a1dba6b46.tar.xz |
Merge branch 'jk/stash-require-clean-index' into maint
A hotfix for the topic already in 'master'.
* jk/stash-require-clean-index:
Revert "stash: require a clean index to apply"
Diffstat (limited to 't/t6033-merge-crlf.sh')
0 files changed, 0 insertions, 0 deletions