diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:20 -0700 |
| commit | 758d0773baa3732bc62838070566513df6a84239 (patch) | |
| tree | aeb0c9d951ced7858d3238bf5a41f59dfb831e01 /merge-recursive.c | |
| parent | f0c344ce578f71aeeee7d40cc01e66f74506ecf9 (diff) | |
| parent | 5c20398699165a91af2d81ea2d20385bc8dd3627 (diff) | |
| download | git-758d0773baa3732bc62838070566513df6a84239.tar.gz | |
Merge branch 'es/outside-repo-errmsg-hints' into maint
An earlier update to show the location of working tree in the error
message did not consider the possibility that a git command may be
run in a bare repository, which has been corrected.
* es/outside-repo-errmsg-hints:
prefix_path: show gitdir if worktree unavailable
prefix_path: show gitdir when arg is outside repo
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions