diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:26:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:26:40 -0800 |
| commit | a49e9af4939c1223020db7915ee612d836c1bcdc (patch) | |
| tree | 51285aad2c6a4942b85542df0a07d658d69ef6df /Documentation/git-cherry-pick.txt | |
| parent | 9f6774ed86a9ac22142c0b37e26e67eb1d032962 (diff) | |
| parent | 55846b9abd128185388418e025651cfd6a299a0e (diff) | |
| download | git-a49e9af4939c1223020db7915ee612d836c1bcdc.tar.gz | |
Merge branch 'tr/maint-merge-file-subdir' into maint
* tr/maint-merge-file-subdir:
merge-file: correctly find files when called in subdir
prefix_filename(): safely handle the case where pfx_len=0
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
0 files changed, 0 insertions, 0 deletions