summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-13 21:44:56 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-13 21:44:56 -0800
commit7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b (patch)
tree6cd9d67bad0f51acbe6baef3fea257f8b0cbc01a /advice.h
parent791970425431878c8abe71645a03f0f64e20e461 (diff)
parent15b7898c5e9fc6fed9a6064213cfcd08cf7d7314 (diff)
downloadgit-7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b.tar.gz
Merge branch 'maint-1.7.6' into maint-1.7.7
* maint-1.7.6: Git 1.7.6.5 blame: don't overflow time buffer fetch: create status table using strbuf Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes
Diffstat (limited to 'advice.h')
0 files changed, 0 insertions, 0 deletions