diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-06 14:34:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-06 14:34:43 -0800 |
| commit | 152a9c17a802379a3a48e025b74dedd76e2623cc (patch) | |
| tree | 35adf01f3da51119a475392076d1cb290b800a00 /sha1_name.c | |
| parent | f26f72de159d7ade2fbe8b48734ce98c1aba4d72 (diff) | |
| parent | abf03eeb8e99538cd31806d5f252214b9fe695a6 (diff) | |
| download | git-152a9c17a802379a3a48e025b74dedd76e2623cc.tar.gz | |
Merge branch 'fc/trivial'
A random collection of style fixes and minor doc updates.
* fc/trivial:
setup: trivial style fixes
run-command: trivial style fixes
diff: trivial style fix
revision: trivial style fixes
pretty: trivial style fix
describe: trivial style fixes
transport-helper: trivial style fix
sha1-name: trivial style cleanup
branch: trivial style fix
revision: add missing include
doc/pull: clarify the illustrations
t: replace pulls with merges
merge: simplify ff-only option
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index 0e5fe7f937..e9c299943b 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -343,7 +343,6 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1, return status; } - int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data) { char hex_pfx[40]; |