projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 793066e 3a243f7)
Merge branch 'dm/stash-k-i-p'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:42 +0000 (11:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:42 +0000 (11:36 -0700)
* 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

1  2 
git-stash.sh patch | diff1 | diff2 | blob | history
t/t3903-stash.sh patch | diff1 | diff2 | blob | history

diff --cc git-stash.sh
Simple merge
diff --cc t/t3903-stash.sh
Simple merge
Git—the stupid content tracker