]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f28d2e3 3a243f7)
Merge branch 'dm/stash-k-i-p' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:57:49 +0000 (14:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:57:49 +0000 (14:57 -0700)
commite9f1878da7be816042c915cdf0542f9325c36209
tree5acea99febe456515699d1d7cd6176be3a0d5b13tree | snapshot
parentf28d2e33c64819d0425c426cd2c4511634096a40commit | diff
parent3a243f7024f21c2c2205cd861f3bb756b0ec43a0commit | diff
Merge branch 'dm/stash-k-i-p' into maint

* dm/stash-k-i-p:
  stash: ensure --no-keep-index and --patch can be used in any order
  stash: add two more tests for --no-keep-index
git-stash.sh diff1 | diff2 | blob | history
t/t3903-stash.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.