Revision e796e6f401d6d7249aa6165e62354bcada3f732a authored by Mohammad Akhlaghi on 01 December 2020, 16:42:50 UTC, committed by Mohammad Akhlaghi on 01 December 2020, 16:47:31 UTC
Until now at the end of the updating process, we hadn't explicity talked about pushing the branches. So people would usually only push their 'master' branch to their remote. While the merged 'master' branch does contain the commits from the core Maneage branch, having a no-updated 'maneage' branch reference on their remote can be confusing. With this commit, at the end of the process to merge with the 'maneage' branch we explicitly recommend to push both the 'master' and 'maneage' branches.
1 parent ac8eee9
.dir-locals.el
;; This files contains Emacs Directory Local Variables.
;;
;; Emacs is an extensible, customizable, free/libre text editor. It
;; allows specification of certain settings that will be applied to
;; all files in current directory and its subdirectories. This is
;; useful in order to automatically enforce certain coding conventions
;; for all contributors of Gnuastro, like the maximum length of lines
;; or the number of spaces to be used for indentation.
;;
;; For more information see (info "(emacs) Directory Variables")
;;
;; Copyright (C) 2017-2020 Mosè Giordano <mose@gnu.org>
;; Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
;;
;; Copying and distribution of this file, with or without modification,
;; are permitted in any medium without royalty provided the copyright
;; notice and this notice are preserved. This file is offered as-is,
;; without any warranty.
(
;; C files.
(c-mode
(c-basic-offset . 2) ;; 2 spaces of indentation
(c-file-style . "gnu")) ;; GNU style for braces
;; Makefiles.
(makefile-mode
(indent-tabs-mode . t)) ;; Real TABs are important in makefiles
;; All other files (this has to be in the end).
(nil
(indent-tabs-mode . nil) ;; No tabs as indentation
(fill-column . 75)) ;; 75-character wide lines
)
Computing file changes ...
