diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-03-21 13:32:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-21 13:32:42 -0700 |
| commit | fb238fb4bab65d9a82fd7e22ab12c414b188463a (patch) | |
| tree | c2abfc6614cc8d478885cdf89b56731863192d77 | |
| parent | Merge branch 'tb/avoid-gcc-on-darwin-10-6' (diff) | |
| parent | Merge branch 'mm/doc-hooks-linkgit-fix' into maint (diff) | |
| download | tgif-fb238fb4bab65d9a82fd7e22ab12c414b188463a.tar.xz | |
Sync with maint
* maint:
Documentation: fix broken linkgit to git-config
git-compat-util: st_add4: work around gcc 4.2.x compiler crash
| -rw-r--r-- | Documentation/githooks.txt | 2 | ||||
| -rw-r--r-- | git-compat-util.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 7ba0ac965d..a2f59b194c 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -397,7 +397,7 @@ preceding SP is also omitted. Currently, no commands pass any 'extra-info'. The hook always runs after the automatic note copying (see -"notes.rewrite.<command>" in linkgit:git-config.txt[1]) has happened, and +"notes.rewrite.<command>" in linkgit:git-config[1]) has happened, and thus has access to these notes. The following command-specific comments apply: diff --git a/git-compat-util.h b/git-compat-util.h index c07e0c1778..474395471f 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -715,8 +715,8 @@ static inline size_t st_add(size_t a, size_t b) (uintmax_t)a, (uintmax_t)b); return a + b; } -#define st_add3(a,b,c) st_add((a),st_add((b),(c))) -#define st_add4(a,b,c,d) st_add((a),st_add3((b),(c),(d))) +#define st_add3(a,b,c) st_add(st_add((a),(b)),(c)) +#define st_add4(a,b,c,d) st_add(st_add3((a),(b),(c)),(d)) static inline size_t st_mult(size_t a, size_t b) { |