From b66f4e808e60ef21285d429dfefb150cf20d2085 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 12 Aug 2020 19:57:00 +0200 Subject: .gitconfig: set pull.ff=only --- .gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitconfig b/.gitconfig index 493e6b1..3ce9f8a 100644 --- a/.gitconfig +++ b/.gitconfig @@ -50,6 +50,9 @@ [push] default = matching +[pull] + ff = only + [merge] tool = vimdiff -- cgit v1.2.3-54-g00ecf plication/atom+xml'/>
summaryrefslogtreecommitdiff
path: root/fs/hfsplus/hfsplus_fs.h
diff options
context:
space:
mode:
authorSergei Antonov <saproj@gmail.com>2014-06-06 14:36:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 16:08:10 -0700
commitffbc0671618e9354ec065144f8a66ec5dd7d5d75 (patch)
tree0d04a4c1e114f7cf2337d53a1b4b68ee6b2d7485 /fs/hfsplus/hfsplus_fs.h
parent297cc27207446e9f054492fff5b561cebc589328 (diff)
hfsplus: coding style fix for declarations in hfsplus_fs.h
Some function declarations in hfsplus_fs.h were with argument names, some without, and some were mixed. This patch adds argument names everywhere, sorts function in order they go in .c files, and moves hfs_part_find() to a proper section. Auto-formatting and sorting was done with: cfunctions *.c | indent -linux | sed "s| \* | \*|" Signed-off-by: Sergei Antonov <saproj@gmail.com> Cc: Vyacheslav Dubeyko <slava@dubeyko.com> Cc: Hin-Tak Leung <htl10@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hfsplus/hfsplus_fs.h')