Merge branch 'sg/stash-k-i'
commit15fc1c02fce2ee6a8a3f625bf24dd782fd905904
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jul 2008 22:15:27 +0000 (13 15:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jul 2008 22:15:27 +0000 (13 15:15 -0700)
tree51f5ba1e438f17516615e06ff031103660918541
parente636799b4d6a6a8abad151697eae27044bb8e95b
parentcaf1899699b2255111a3db335553e31f3718c1c9
Merge branch 'sg/stash-k-i'

* sg/stash-k-i:
  Documentation: tweak use case in "git stash save --keep-index"
  stash: introduce 'stash save --keep-index' option
Documentation/git-stash.txt
contrib/completion/git-completion.bash