]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56a1d9c 7723436)
Merge branch 'js/stash-p-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2020 22:50:06 +0000 (15:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2020 22:50:06 +0000 (15:50 -0700)
Allowing the user to split a patch hunk while "git stash -p" does
not work well; a band-aid has been added to make this (partially)
work better.

* js/stash-p-fix:
  stash -p: (partially) fix bug concerning split hunks
  t3904: fix incorrect demonstration of a bug

1  2 
builtin/stash.c patch | diff1 | diff2 | blob | history

diff --cc builtin/stash.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.