diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
| commit | b76a68630eaab75c4eb1c41f0fc091811854ff43 (patch) | |
| tree | 5be60264e80970f60d9c56b410c8828693be8588 /user-manual.txt | |
| parent | 0aadbc37c068365a09926cd895863c4a725b45d6 (diff) | |
| download | git-htmldocs-b76a68630eaab75c4eb1c41f0fc091811854ff43.tar.gz | |
Autogenerated HTML docs for v1.7.10.1-433-g34875
Diffstat (limited to 'user-manual.txt')
| -rw-r--r-- | user-manual.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/user-manual.txt b/user-manual.txt index 6c7fee7ef..1b942074b 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -1611,7 +1611,7 @@ Recovering lost changes Reflogs ^^^^^^^ -Say you modify a branch with `linkgit:git-reset[1] --hard`, and then +Say you modify a branch with +linkgit:git-reset[1] \--hard+, and then realize that the branch was the only reference you had to that point in history. @@ -4207,7 +4207,7 @@ commits one by one with the function `get_revision()`. If you are interested in more details of the revision walking process, just have a look at the first implementation of `cmd_log()`; call -`git show v1.3.0{tilde}155^2{tilde}4` and scroll down to that function (note that you +`git show v1.3.0~155^2~4` and scroll down to that function (note that you no longer need to call `setup_pager()` directly). Nowadays, `git log` is a builtin, which means that it is _contained_ in the @@ -4270,9 +4270,9 @@ Two things are interesting here: negative numbers in case of different errors--and 0 on success. - the variable `sha1` in the function signature of `get_sha1()` is `unsigned - char {asterisk}`, but is actually expected to be a pointer to `unsigned + char *`, but is actually expected to be a pointer to `unsigned char[20]`. This variable will contain the 160-bit SHA-1 of the given - commit. Note that whenever a SHA-1 is passed as `unsigned char {asterisk}`, it + commit. Note that whenever a SHA-1 is passed as `unsigned char *`, it is the binary representation, as opposed to the ASCII representation in hex characters, which is passed as `char *`. |