]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commite81ecff10a19acea0bf58a260e919b1920925108
tree5fb4f0fcd7df32cac63676d32b87b5b38bfe7637tree | snapshot
parent56a1d9ca6b069b707f2f728bf74cd928bfa2a88ecommit | diff
parent7723436149b971643995f877b9df68d17f635012commit | diff
Merge branch 'js/stash-p-fix'

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
builtin/stash.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.