summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-19 13:17:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-19 13:17:52 -0700
commit05c39674f35f33b6d2311da6c63268b9e7739840 (patch)
tree8cb45c805c023f64a42d5ae9969865c863385ce1 /Documentation/diff-format.txt
parentMerge branch 'jk/git-no-more-argv0-path-munging' (diff)
parentstash: require a clean index to apply (diff)
downloadtgif-05c39674f35f33b6d2311da6c63268b9e7739840.tar.xz
Merge branch 'jk/stash-require-clean-index'
"git stash pop/apply" forgot to make sure that not just the working tree is clean but also the index is clean. The latter is important as a stash application can conflict and the index will be used for conflict resolution. * jk/stash-require-clean-index: stash: require a clean index to apply t3903: avoid applying onto dirty index t3903: stop hard-coding commit sha1s
Diffstat (limited to 'Documentation/diff-format.txt')
0 files changed, 0 insertions, 0 deletions