diff options
Diffstat (limited to 'lisp/vc-git.el')
| -rw-r--r-- | lisp/vc-git.el | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 52482d9ff4b..4896f79a395 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el | |||
| @@ -118,13 +118,6 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 118 | :version "23.1" | 118 | :version "23.1" |
| 119 | :group 'vc) | 119 | :group 'vc) |
| 120 | 120 | ||
| 121 | (defcustom vc-git-add-signoff nil | ||
| 122 | "Add a Signed-off-by line when committing." | ||
| 123 | :type 'boolean | ||
| 124 | :version "23.2" | ||
| 125 | :group 'vc) | ||
| 126 | |||
| 127 | |||
| 128 | (defvar git-commits-coding-system 'utf-8 | 121 | (defvar git-commits-coding-system 'utf-8 |
| 129 | "Default coding system for git commits.") | 122 | "Default coding system for git commits.") |
| 130 | 123 | ||
| @@ -515,7 +508,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 515 | (defun vc-git-checkin (files rev comment) | 508 | (defun vc-git-checkin (files rev comment) |
| 516 | (let ((coding-system-for-write git-commits-coding-system)) | 509 | (let ((coding-system-for-write git-commits-coding-system)) |
| 517 | (vc-git-command nil 0 files "commit" | 510 | (vc-git-command nil 0 files "commit" |
| 518 | (if vc-git-add-signoff "-s") "-m" comment "--only" "--"))) | 511 | "-m" comment "--only" "--"))) |
| 519 | 512 | ||
| 520 | (defun vc-git-find-revision (file rev buffer) | 513 | (defun vc-git-find-revision (file rev buffer) |
| 521 | (let* (process-file-side-effects | 514 | (let* (process-file-side-effects |
| @@ -766,10 +759,6 @@ or BRANCH^ (where \"^\" can be repeated)." | |||
| 766 | (define-key map [git-ss] | 759 | (define-key map [git-ss] |
| 767 | '(menu-item "Show Stash..." vc-git-stash-show | 760 | '(menu-item "Show Stash..." vc-git-stash-show |
| 768 | :help "Show stash contents")) | 761 | :help "Show stash contents")) |
| 769 | (define-key map [git-sig] | ||
| 770 | '(menu-item "Add Signed-off-by on commit" vc-git-toggle-signoff | ||
| 771 | :help "Add Add Signed-off-by when commiting (i.e. add the -s flag)" | ||
| 772 | :button (:toggle . vc-git-add-signoff))) | ||
| 773 | map)) | 762 | map)) |
| 774 | 763 | ||
| 775 | (defun vc-git-extra-menu () vc-git-extra-menu-map) | 764 | (defun vc-git-extra-menu () vc-git-extra-menu-map) |
| @@ -779,10 +768,6 @@ or BRANCH^ (where \"^\" can be repeated)." | |||
| 779 | (defun vc-git-root (file) | 768 | (defun vc-git-root (file) |
| 780 | (vc-find-root file ".git")) | 769 | (vc-find-root file ".git")) |
| 781 | 770 | ||
| 782 | (defun vc-git-toggle-signoff () | ||
| 783 | (interactive) | ||
| 784 | (setq vc-git-add-signoff (not vc-git-add-signoff))) | ||
| 785 | |||
| 786 | ;; Derived from `lgrep'. | 771 | ;; Derived from `lgrep'. |
| 787 | (defun vc-git-grep (regexp &optional files dir) | 772 | (defun vc-git-grep (regexp &optional files dir) |
| 788 | "Run git grep, searching for REGEXP in FILES in directory DIR. | 773 | "Run git grep, searching for REGEXP in FILES in directory DIR. |