diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-09 21:33:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 21:33:39 (GMT) |
| commit | 10dd3b2bf1444695416c0dac951297acf7d4e5e4 (patch) | |
| tree | dfee18f87e5a8e382503931719b285d8a7a226ef /Documentation | |
| parent | b1af9630d758e1728fc0008b3f18d90d8f87f4c5 (diff) | |
| parent | 791970425431878c8abe71645a03f0f64e20e461 (diff) | |
| download | git-10dd3b2bf1444695416c0dac951297acf7d4e5e4.zip git-10dd3b2bf1444695416c0dac951297acf7d4e5e4.tar.gz git-10dd3b2bf1444695416c0dac951297acf7d4e5e4.tar.bz2 | |
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7:
am: don't persist keepcr flag
mingw: give waitpid the correct signature
git symbolic-ref: documentation fix
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-symbolic-ref.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.txt index 75b1ae5..a45d4c4 100644 --- a/Documentation/git-symbolic-ref.txt +++ b/Documentation/git-symbolic-ref.txt @@ -43,12 +43,9 @@ In the past, `.git/HEAD` was a symbolic link pointing at `refs/heads/master`. When we wanted to switch to another branch, we did `ln -sf refs/heads/newbranch .git/HEAD`, and when we wanted to find out which branch we are on, we did `readlink .git/HEAD`. -This was fine, and internally that is what still happens by -default, but on platforms that do not have working symlinks, -or that do not have the `readlink(1)` command, this was a bit -cumbersome. On some platforms, `ln -sf` does not even work as -advertised (horrors). Therefore symbolic links are now deprecated -and symbolic refs are used by default. +But symbolic links are not entirely portable, so they are now +deprecated and symbolic refs (as described above) are used by +default. 'git symbolic-ref' will exit with status 0 if the contents of the symbolic ref were printed correctly, with status 1 if the requested |