Junio C Hamano 9ca488c04b Merge branch 'nd/rebase-show-current-patch' ... The new "--show-current-patch" option gives an end-user facing way to get the diff being applied when "git rebase" (and "git am") stops with a conflict. * nd/rebase-show-current-patch: rebase: introduce and use pseudo-ref REBASE_HEAD rebase: add --show-current-patch am: add --show-current-patch		2018-03-06 14:54:02 -08:00
..
.gitattributes	completion: mark bash script as LF-only	2017-05-10 13:32:51 +09:00
git-completion.bash	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
git-completion.tcsh	git-completion.tcsh: fix redirect with noclobber	2015-06-09 11:21:15 -07:00
git-completion.zsh	completion: fill COMPREPLY directly when completing refs	2017-03-23 11:18:22 -07:00
git-prompt.sh	git-prompt: fix reading files with windows line endings	2017-12-06 10:08:13 -08:00