diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-15 01:44:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-15 01:44:58 -0800 |
| commit | f7a2bdb1f070cd79879671391fa8121ef9930abe (patch) | |
| tree | 82dca95702b6488df3c099a570add33164df66d3 /Documentation/git-merge-file.txt | |
| parent | Merge branch 'ff/submodule-no-fetch' (diff) | |
| parent | git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree (diff) | |
| download | tgif-f7a2bdb1f070cd79879671391fa8121ef9930abe.tar.xz | |
Merge branch 'mc/setup-cd-p'
* mc/setup-cd-p:
git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions