...
 
Commits (778)
../Documentation/CONTRIBUTING.md
\ No newline at end of file
../Documentation/ISSUE_TEMPLATE
\ No newline at end of file
../Documentation/PULL_REQUEST_TEMPLATE
\ No newline at end of file
Alex Dunn <adunn@ucsb.edu> <dunn.alex@gmail.com>
Alex Ott <alexott@gmail.com> <ott@flash.lan>
Andriy Kmit' <dev@madand.net>
Bar Magal <bmagamb@gmail.com>
Bradley Wright <brad@intranation.com> <bradley.wright@digital.cabinet-office.gov.uk>
Buster Copley <buster@buster.me.uk>
Chillar Anand <anand21nanda@gmail.com>
Christophe Junke <junke.christophe@gmail.com> <christophe.junke@parrot.com>
Damien Cassou <damien@cassou.me> <damien.cassou@gmail.com>
David Abrahams <dave@boostpro.com>
Dean Kariniemi <8913263+d3k4r@users.noreply.github.com>
Dennis Paskorz <dennis@walltowall.com>
Evgkeni Sampelnikof <esabof@gmail.com> <faceoffuture@yahoo.gr>
Evgkeni Sampelnikof <esabof@gmail.com> <sabof@example.com>
Fabian Wiget <fabacino@gmail.com>
Fritz Stelzer <brotzeitmacher@gmail.com>
Graham Clark <grclark@gmail.com> <gcla@moria.(none)>
Ivan Brennan <ivan.brennan@gmail.com>
Jesse Alama <jesse.alama@gmail.com> <alama@stanford.edu>
Joakim Jalap <JOJA@stoneridge.com>
Jon Vanderwijk <jonathn@github.com>
Jonas Bernoulli <jonas@bernoul.li>
Jonas Bernoulli <jonas@bernoul.li> <jonasbernoulli@gmail.com>
Kan-Ru Chen <kanru@kanru.info> <koster@debian.org>
Leo Liu <sdl.web@gmail.com>
Luís Oliveira <luismbo@gmail.com> <loliveira@common-lisp.net>
Luís Oliveira <luismbo@gmail.com> Luís Borges de Oliveira <lbo@siscog.pt>
Marc Herbert <marc.herbert@gmail.com> <marc.herbert+git@gmail.com>
Marc Herbert <marc.herbert@gmail.com> <Marc.Herbert+git@gmail.com>
Marc Herbert <marc.herbert@gmail.com> <marc.herbert+git@gmail.com>
Marcel Wolf <mwolf@ml1.net> marcel-wolf
Marian Schubert <marian.schubert@gmail.com> <marian.schubert@gooddata.com>
Marius Vollmer <marius.vollmer@gmail.com> <marius.vollmer@nokia.com>
......@@ -32,9 +38,6 @@ Mark Karpov <markkarpov@opmbx.org>
Natalie Weizenbaum <nex342@gmail.com> Nathan Weizenbaum
Noam Postavsky <npostavs@users.sourceforge.net>
Noam Postavsky <npostavs@users.sourceforge.net> <github.10.npostavs@spamgourmet.com>
Óscar Fuentes <ofv@wanadoo.es> <ofv@wanadoo.es>
Óscar Fuentes <ofv@wanadoo.es> <oscar@nc10>
Óscar Fuentes <ofv@wanadoo.es> <oscar@qcore>
Peter J. Weisberg <pj@irregularexpressions.net>
Peter Vasil <mail@petervasil.net>
Phil Sainty <phil@catalyst.net.nz> <phil-s@users.noreply.github.com>
......@@ -42,15 +45,19 @@ Philippe Vaucher <philippe.vaucher@gmail.com> <philippe@stvs.ch>
Raimon Grau <raimon@3scale.net> <raimonster@gmail.com>
Rémi Vanicat <vanicat@debian.org> <github.20.vanicat@mamber.net>
Rüdiger Sonderfeld <ruediger@c-plusplus.net> <ruediger@c-plusplus.de>
Sébastien Gross <seb@chezwam.org> <seb•ɑƬ•chezwam•ɖɵʈ•org>
Seong-Kook Shin <cinsky@gmail.com>
Silent Sphere <silentsphere110@gmail.com>
Sylvain Rousseau <thisirs@gmail.com>
Syohei Yoshida <syohex@gmail.com>
Sébastien Gross <seb@chezwam.org> <seb•ɑƬ•chezwam•ɖɵʈ•org>
Tunc Uzlu <bb2020@users.noreply.github.com>
Wei Huang <weih@opera.com>
Wilfred Hughes <me@wilfred.me.uk> <whughes@ahl.com>
Wouter Bolsterlee <wouter@bolsterl.ee>
Yann Hodique <yann.hodique@gmail.com> <hodiquey@vmware.com>
Yann Hodique <yann.hodique@gmail.com> <yann.hodique@bromium.com>
Yann Hodique <yann.hodique@gmail.com> <yhodique@vmware.com>
Yuichi Higashi <aaa707b@gmail.com>
Óscar Fuentes <ofv@wanadoo.es> <ofv@wanadoo.es>
Óscar Fuentes <ofv@wanadoo.es> <oscar@nc10>
Óscar Fuentes <ofv@wanadoo.es> <oscar@qcore>
......@@ -7,8 +7,10 @@ env:
- EMACS_VERSION=24.4
- EMACS_VERSION=24.5
- EMACS_VERSION=25.1
- EMACS_VERSION=25.2
- EMACS_VERSION=25 # emacs-25 branch, built daily
# 25.2 is identical to 25.3 except for a critical security bug in
# enriched text mode (see Emacs Bug#28350).
- EMACS_VERSION=25.3
- EMACS_VERSION=26 # emacs-26 branch, built daily
- EMACS_VERSION=master # master branch, built daily
allow_failures:
- env: EMACS_VERSION=master
......@@ -17,8 +19,11 @@ install:
- tar -xaf emacs-bin-${EMACS_VERSION}.tar.gz -C /
- export EMACS=/tmp/emacs/bin/emacs
- $CURL -O https://raw.githubusercontent.com/magnars/dash.el/master/dash.el
- $EMACS -Q --batch -f batch-byte-compile dash.el
- $CURL -O https://raw.githubusercontent.com/tarsius/ghub/master/ghub.el
- $CURL -o let-alist.el https://elpa.gnu.org/packages/let-alist-1.0.5.el
- $CURL -O https://raw.githubusercontent.com/magit/magit-popup/master/magit-popup.el
- $CURL -O https://raw.githubusercontent.com/magit/with-editor/master/with-editor.el
- $EMACS -Q --batch -L . -f batch-byte-compile dash.el ghub.el let-alist.el magit-popup.el with-editor.el
- $EMACS --version
script:
- git config --global user.name "A U Thor"
......
......@@ -39,6 +39,7 @@ Contributors
------------
- Aaron Culich <aculich@gmail.com>
- Aaron Madlon-Kay <aaron@madlon-kay.com>
- Abdo Roig-Maranges <abdo.roig@gmail.com>
- Adam Benanti <0entropy@protonmail.com>
- Adam Porter <adam@alphapapa.net>
......@@ -46,6 +47,7 @@ Contributors
- Adeodato Simó <dato@net.com.org.es>
- Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Alan Falloon <alan.falloon@gmail.com>
- Alban Gruin <alban@pa1ch.fr>
- Aleksey Uimanov <s9gf4ult@gmail.com>
- Alexander Gramiak <fice-t@protonmail.com>
- Alex Dunn <adunn@ucsb.edu>
......@@ -64,6 +66,7 @@ Contributors
- Andriy Kmit' <dev@madand.net>
- Andy Sawyer <git@pureabstract.org>
- Barak A. Pearlmutter <barak+git@pearlmutter.net>
- Bar Magal <bmagamb@gmail.com>
- Bart Bakker <bart@thesoftwarecraft.com>
- Basil L. Contovounesios <contovob@tcd.ie>
- Bastian Beischer <beischer@physik.rwth-aachen.de>
......@@ -73,15 +76,18 @@ Contributors
- Brandon W Maister <quodlibetor@gmail.com>
- Brian Warner <warner@lothar.com>
- Bryan Shell <bryan.shell@orbitz.com>
- Buster Copley <buster@buster.me.uk>
- Carl Lieberman <liebermancarl@gmail.com>
- Chillar Anand <anand21nanda@gmail.com>
- Chris Bernard <cebernard@gmail.com>
- Chris Done <chrisdone@gmail.com>
- Chris LaRose <cjlarose@gmail.com>
- Chris Moore <dooglus@gmail.com>
- Chris Ring <chris@ringthis.com>
- Chris Shoemaker <chris@mojotech.com>
- Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
- Christian Kluge <ckfrakturfreak@web.de>
- Christophe Junke <junke.christophe@gmail.com>
- Christopher Monsanto <chris@monsan.to>
- Cornelius Mika <cornelius.mika@gmail.com>
- Craig Andera <candera@wangdera.com>
......@@ -90,13 +96,18 @@ Contributors
- Dan Erikson <derikson3@gmail.com>
- Daniel Brockman <daniel@gointeractive.se>
- Daniel Farina <drfarina@acm.org>
- Daniel Gröber <daniel@dps.uibk.ac.at>
- Daniel Hackney <dan@haxney.org>
- Daniel Kraus <daniel@kraus.my>
- Daniel Mai <daniel@danielmai.net>
- Dan LaManna <dan.lamanna@gmail.com>
- Dato Simó <dato@net.com.org.es>
- David Abrahams <dave@boostpro.com>
- David Ellison <davide@voicebox.com>
- David Hull <david.hull@openx.com>
- David L. Rager <ragerdl@gmail.com>
- David Wallin <david.wallin@gmail.com>
- Dean Kariniemi <8913263+d3k4r@users.noreply.github.com>
- Dennis Paskorz <dennis@walltowall.com>
- Divye Kapoor <divye@google.com>
- Dominique Quatravaux <domq@google.com>
......@@ -112,6 +123,7 @@ Contributors
- Feng Li <fengli@blackmagicdesign.com>
- Florian Ragwitz <rafl@debian.org>
- Fritz Grabo <fritz.grabo@gmail.com>
- Fritz Stelzer <brotzeitmacher@gmail.com>
- Geoff Shannon <geoffpshannon@gmail.com>
- George Kadianakis <desnacked@gmail.com>
- Graham Clark <grclark@gmail.com>
......@@ -132,12 +144,15 @@ Contributors
- Jeff Dairiki <dairiki@dairiki.org>
- Jeremy Meng <yumeng@microsoft.com>
- Jesse Alama <jesse.alama@gmail.com>
- Jim Blandy <jimb@red-bean.com>
- Joakim Jalap <JOJA@stoneridge.com>
- Johann Klähn <kljohann@gmail.com>
- John Mastro <john.b.mastro@gmail.com>
- John Wiegley <johnw@newartisans.com>
- Jonas Bernoulli <jonas@bernoul.li>
- Jonathan Leech-Pepin <jonathan.leechpepin@gmail.com>
- Jonathan Roes <jroes@jroes.net>
- Jon Vanderwijk <jonathn@github.com>
- Jordan Greenberg <jordan@softwareslave.com>
- Josiah Schwab <jschwab@gmail.com>
- Julien Danjou <julien@danjou.info>
......@@ -146,6 +161,7 @@ Contributors
- Justin Guenther <jguenther@gmail.com>
- Justin Thomas <justin.thomas1@gmail.com>
- Kan-Ru Chen <kanru@kanru.info>
- Kenny Ballou <kballou@devnulllabs.io>
- Keshav Kini <keshav.kini@gmail.com>
- Kévin Le Gouguec <kevin.legouguec@gmail.com>
- Kimberly Wolk <kimwolk@hotmail.com>
......@@ -157,6 +173,7 @@ Contributors
- Leo Liu <sdl.web@gmail.com>
- Leonardo Etcheverry <leo@kalio.net>
- Lingchao Xin <douglarek@users.noreply.github.com>
- Li-Yun Chang <michael142536@gmail.com>
- Lluís Vilanova <vilanova@ac.upc.edu>
- Loic Dachary <loic@dachary.org>
- Luís Oliveira <luismbo@gmail.com>
......@@ -174,6 +191,8 @@ Contributors
- Mark Hepburn <Mark.Hepburn@csiro.au>
- Mark Karpov <markkarpov@opmbx.org>
- Mark Oteiza <mvoteiza@udel.edu>
- Matthew Fluet <matthew.fluet@gmail.com>
- Matthieu Hauglustaine <matt.hauglustaine@gmail.com>
- Matus Goljer <dota.keys@gmail.com>
- Michael Fogleman <michaelwfogleman@gmail.com>
- Michael Griffiths <mikey@cich.li>
......@@ -197,6 +216,7 @@ Contributors
- Noam Postavsky <npostavs@users.sourceforge.net>
- Ole Arndt <oliver.arndt@cegedim.com>
- Oleh Krehel <ohwoeowho@gmail.com>
- Orivej Desh <orivej@gmx.fr>
- Óscar Fuentes <ofv@wanadoo.es>
- Paul Stadig <paul@stadig.name>
- Pavel Holejsovsky <pavel.holejsovsky@upek.com>
......@@ -269,11 +289,13 @@ Contributors
- Tom Feist <shabble@metavore.org>
- Tunc Uzlu <bb2020@users.noreply.github.com>
- Vineet Naik <vineet@helpshift.com>
- Vladimir Panteleev <git@thecybershadow.net>
- Wei Huang <weih@opera.com>
- Wilfred Hughes <me@wilfred.me.uk>
- Win Treese <treese@acm.org>
- Wouter Bolsterlee <wouter@bolsterl.ee>
- Xavier Noria <fxn@hashref.com>
- Xu Chunyang <mail@xuchunyang.me>
- Yann Hodique <yann.hodique@gmail.com>
- York Zhao <gtdplatform@gmail.com>
- Yuichi Higashi <aaa707b@gmail.com>
......
This diff is collapsed.
......@@ -8,7 +8,23 @@ Code contributions
If you have some code which you would like to be merged, then open a
[pull request][pulls]. Please create atomic commits with descriptive
commit messages.
commit messages and use a dedicated feature branch (`b s` might help
with the latter).
Documentation contributions
===========================
Improving the documentation is always a good way to get started
contributing to some project.
In the case of Magit this is somewhat complicated by the fact that
we use some custom extensions. Some meta documentation can be found
[here][metadocs].
TL;DR — Edit `magit.org`. Do not edit `magit.texi`. And don't touch
the version numbers. The maintainers will then update `magit.texi`
and the version numbers in `magit.org` and amend those changes to your
commit.
Donations
=========
......@@ -19,4 +35,5 @@ Please also consider to contribute by making a
[donations]: https://magit.vc/donate/
[issues]: https://github.com/magit/magit/issues
[metadocs]: https://github.com/magit/magit/wiki/Documentation-tools-and-conventions
[pulls]: https://github.com/magit/magit/pulls
......@@ -2,14 +2,13 @@
DO NOT use this issue tracker for support requests
=================================================================
Please use the Emacs StackExchange site [1] or the Gitter chat [2] for support requests. But before you do that please read the list of frequently asked questions [3] and consult the manual [4] and a search engine.
Please use the Emacs StackExchange site [1] for support requests. But before you do that please read the list of frequently asked questions [2] and consult the manual [3] and a search engine.
We only use this issue tracker for feature requests and for defects.
[1]: https://emacs.stackexchange.com
[2]: https://gitter.im/magit/magit
[3]: https://magit.vc/manual/magit/FAQ.html
[4]: https://magit.vc/manual/magit/#Top
[2]: https://magit.vc/manual/magit/FAQ.html
[3]: https://magit.vc/manual/magit/#Top
=================================================================
......@@ -48,7 +47,7 @@ Alternatively, run `M-x magit-emacs-Q-command RET` to save a shell command to th
Finally, if that didn't work and you have installed Magit from Melpa, then run commands similar to the ones below, but use tab completion to replace the various Ns with the correct versions:
$ cd ~/.emacs.d/elpa/magit-N
$ emacs -Q --debug-init --eval '(setq debug-on-error t)' -L ../dash-N -L ../git-commit-N -L ../magit-popup-N -L ../with-editor-N -L . -l magit
$ emacs -Q --debug-init --eval '(setq debug-on-error t)' -L ../dash-N -L ../git-commit-N -L ../magit-popup-N -L ../with-editor-N -L ../ghub-N -L . -l magit
More debugging tools are described in the manual [6].
......
......@@ -17,19 +17,30 @@ pdf: $(PDFFILES)
@printf "Generating $@\n"
@$(MAKEINFO) --no-split $< -o $@
dir: magit.info magit-popup.info
dir: magit.info
@printf "Generating dir\n"
@echo $^ | xargs -n 1 $(INSTALL_INFO) --dir=$@
HTML_FIXUP_CSS = '/<link rel="stylesheet" type="text\/css" href="\/assets\/page.css">/a\
<link class="s-css-s--style" rel="stylesheet" title="Default" href="/assets/themes/default.css">\
\n<link class="s-css-s--style" rel="stylesheet alternate" title="Default high contrast" href="/assets/themes/default-high-contrast.css">\
\n<link class="s-css-s--style" rel="stylesheet alternate" title="Solarized dark xterm" href="/assets/themes/solarized-dark-xterm.css">\
\n<link class="s-css-s--style" rel="stylesheet alternate" title="Black on white" href="/assets/themes/black-on-white.css">\
\n<script src="/assets/js/simple-css-switch.js"></script>'
HTML_FIXUP_ONLOAD = 's/<body lang="en">/<body lang="en" onload="simpleCssSwitch()">/'
HTML_FIXUP_MENU = '/<\/body>/i<div id="s-css-s--menu"><\/div>'
%.html: %.texi
@printf "Generating $@\n"
@$(MAKEINFO) --html --no-split $(MANUAL_HTML_ARGS) $<
@sed -i -e $(HTML_FIXUP_CSS) -e $(HTML_FIXUP_ONLOAD) -e $(HTML_FIXUP_MENU) $@
html-dir: $(TEXIFILES)
@printf "Generating magit/*.html\n"
@$(MAKEINFO) --html $(MANUAL_HTML_ARGS) magit.texi
@printf "Generating magit-popup/*.html\n"
@$(MAKEINFO) --html $(MANUAL_HTML_ARGS) magit-popup.texi
@for f in $$(find magit -name '*.html') ; do \
sed -i -e $(HTML_FIXUP_CSS) -e $(HTML_FIXUP_ONLOAD) -e $(HTML_FIXUP_MENU) $$f ; \
done
%.pdf: %.texi
@printf "Generating $@\n"
......@@ -55,22 +66,24 @@ clean:
## Release management ################################################
# Because most users don't have the necessary tools we cannot
# use "%.texi: %.org". Instead we have to hardcode each file
# using a shared target.
DOC_ARGS = --batch -Q $(DOC_LOAD_PATH)
DOC_ARGS += -l magit-utils.el -l ox-extra -l org-man -l ox-texinfo+.el
DOC_EVAL = --eval "(ox-extras-activate '(ignore-headlines))"
DOC_EVAL += -f org-texinfo-export-to-texinfo
texi: $(TEXIPAGES)
@printf "Generating magit.texi\n"
@$(EMACSBIN) $(DOC_ARGS) magit.org $(DOC_EVAL)
@echo >> magit.texi
@printf "Generating magit-popup.texi\n"
@$(EMACSBIN) $(DOC_ARGS) magit-popup.org $(DOC_EVAL)
@echo >> magit-popup.texi
ORG_ARGS = --batch -Q $(ORG_LOAD_PATH)
ORG_ARGS += -l magit-utils.el -l org-man -l ox-extra -l ox-texinfo+.el
ORG_EVAL = --eval "(ox-extras-activate '(ignore-headlines))"
ORG_EVAL += --eval "(setq indent-tabs-mode nil)"
ORG_EVAL += --eval "(setq org-src-preserve-indentation nil)"
ORG_EVAL += --funcall org-texinfo-export-to-texinfo
# This target first bumps version strings in the Org source. The
# necessary tools might be missing so other targets do not depend
# on this target and it has to be run explicitly when appropriate.
#
# AMEND=t make texi Update manual to be amended to HEAD.
# VERSION=N make texi Update manual for release.
#
texi:
@$(EMACSBIN) $(ORG_ARGS) $(PKG).org $(ORG_EVAL)
@printf "\n" >> $(PKG).texi
@rm -f $(PKG).texi~
stats:
@printf "Generating statistics\n"
......@@ -87,49 +100,43 @@ AUTHORS.md:
|| printf "FAILED (non-fatal)\n"
DOMAIN ?= magit.vc
PUBLISH_PATH ?= /manual/
RELEASE_PATH ?= /manual/$(VERSION)/
S3_BUCKET ?= s3://$(DOMAIN)
PUBLISH_TARGET = $(S3_BUCKET)$(PUBLISH_PATH)
RELEASE_TARGET = $(S3_BUCKET)$(RELEASE_PATH)
CFRONT_DIST ?= E2LUHBKU1FBV02
PUBLISH_BUCKET ?= s3://$(DOMAIN)
PREVIEW_BUCKET ?= s3://preview.$(DOMAIN)
PUBLISH_URL ?= http://$(DOMAIN).s3-website.eu-central-1.amazonaws.com
PREVIEW_URL ?= http://preview.$(DOMAIN).s3-website.eu-central-1.amazonaws.com
CFRONT_PATHS = $(PKG).html $(PKG).pdf $(PKG)/*
preview-stats: stats
@printf "Uploading statistics...\n"
@aws s3 sync $(statsdir) $(PREVIEW_BUCKET)/stats/
@aws cloudfront create-invalidation \
--distribution-id $(CFRONT_DIST) --paths "/stats/*"
@printf "Uploaded to $(PREVIEW_URL)/stats/\n"
comma := ,
empty :=
space := $(empty) $(empty)
publish-stats: stats
@printf "Uploading statistics...\n"
@aws s3 sync $(statsdir) $(PUBLISH_BUCKET)/stats/
@aws cloudfront create-invalidation \
--distribution-id $(CFRONT_DIST) --paths "/stats/*"
@aws s3 sync $(statsdir) $(S3_BUCKET)/stats/
@printf "Uploaded to $(PUBLISH_URL)/stats/\n"
preview-manuals: html html-dir pdf
@printf "Uploading manuals...\n"
@aws s3 sync magit $(PREVIEW_BUCKET)/manual/magit/
@aws s3 cp magit.html $(PREVIEW_BUCKET)/manual/
@aws s3 cp magit.pdf $(PREVIEW_BUCKET)/manual/
@aws s3 sync magit-popup $(PREVIEW_BUCKET)/manual/magit-popup/
@aws s3 cp magit-popup.html $(PREVIEW_BUCKET)/manual/
@aws s3 cp magit-popup.pdf $(PREVIEW_BUCKET)/manual/
@printf "Generating CDN invalidation\n"
@aws cloudfront create-invalidation \
--distribution-id $(CFRONT_DIST) --paths "/manual/*"
@printf "Uploaded to $(PREVIEW_URL)/manual/\n"
--distribution-id $(CFRONT_DIST) --paths "/stats/*" > /dev/null
publish-manuals: html html-dir pdf
@printf "Uploading manuals...\n"
@aws s3 sync magit $(PUBLISH_BUCKET)/manual/magit/
@aws s3 cp magit.html $(PUBLISH_BUCKET)/manual/
@aws s3 cp magit.pdf $(PUBLISH_BUCKET)/manual/
@aws s3 sync magit-popup $(PUBLISH_BUCKET)/manual/magit-popup/
@aws s3 cp magit-popup.html $(PUBLISH_BUCKET)/manual/
@aws s3 cp magit-popup.pdf $(PUBLISH_BUCKET)/manual/
@aws cloudfront create-invalidation \
--distribution-id $(CFRONT_DIST) --paths "/manual/*"
@printf "Uploaded to $(PUBLISH_URL)/manual/\n"
@aws s3 cp $(PKG).html $(PUBLISH_TARGET)
@aws s3 cp $(PKG).pdf $(PUBLISH_TARGET)
@aws s3 sync --delete $(PKG) $(PUBLISH_TARGET)$(PKG)/
@printf "Generating CDN invalidation\n"
@aws cloudfront create-invalidation --distribution-id $(CFRONT_DIST) --paths \
"$(subst $(space),$(comma),$(addprefix $(PUBLISH_PATH),$(CFRONT_PATHS)))" > /dev/null
release-manuals: html html-dir pdf
@aws s3 cp $(PKG).html $(RELEASE_TARGET)
@aws s3 cp $(PKG).pdf $(RELEASE_TARGET)
@aws s3 sync --delete $(PKG) $(RELEASE_TARGET)$(PKG)/
@printf "Generating CDN invalidation\n"
@aws cloudfront create-invalidation --distribution-id $(CFRONT_DIST) --paths \
"$(subst $(space),$(comma),$(addprefix $(RELEASE_PATH),$(CFRONT_PATHS)))" > /dev/null
# Templates ##########################################################
......
=================================================================
What you should write here
=================================================================
Please summarize the changes made in the commits. Explain why you are making these changes, not just what changes you are making. This also applies to the commit messages.
=================================================================
How to update the manual
=================================================================
If you make changes to the manual, then edit only "magit.org". Do not manually edit "magit.texi". The latter has to be generate from the former. If you want to do that yourself, then follow the instructions at [1]. Otherwise a maintainer will do it and amend that to your commit.
[1]: https://github.com/magit/magit/wiki/Documentation-tools-and-conventions
This diff is collapsed.
Magit v2.12.1 Release Notes
===========================
Fixes since v2.12.0
-------------------
* Magit 2.12.0 depended on a non-existent Magit-Popup version.
* Key bindings in `magit-remote-popup' conflicted.
Authors
-------
8 Jonas Bernoulli
1 Dean Kariniemi
1 Phil Sainty
It's Magit! A Git Porcelain inside Emacs
=========================================
Magit is a text-based Git user interface that puts an unmatched focus
on streamlining workflows. Commands are invoked using short mnemonic
key sequences that take the cursor’s position in the highly actionable
interface into account to provide context-sensitive behavior.
With Magit you can do nearly everything that you can do when using Git
on the command-line, but at greater speed and while taking advantage
of advanced features that previously seemed too daunting to use on a
daily basis. Many users will find that by using Magit they can become
more effective Git user.
For more information about Magit, see https://magit.vc
and https://emacsair.me/2017/09/01/campaign-articles.
Magit v2.13.0 Release Notes
===========================
Released 2nd June 2018 by Jonas Bernoulli.
I am pleased to announce the release of Magit version 2.13.0,
representing 166 commits by 18 contributors over two months.
Also see https://emacsair.me/2018/06/02/magit-2.13.
Upcoming breaking changes
-------------------------
* This is the last release to support Emacs 24.4. Going forward at
least Emacs 25.1 is required.
* This is the last release to support Git 1.9.4. Going forward at
least Git 2.4 is required.
* Many functions and variables that have been declared obsolete for
a while now are going to be removed after this release.
All of these changes will happen on "master", the development branch.
Note that the snapshot packages on Melpa are built from that branch.
If you cannot update Emacs and/or Git now, then you should pin Magit
to Melpa-Stable to stick with this release (and bugfix releases) for
the time being.
Breaking changes
----------------
* As announced earlier, the obsolete option `magit-no-confirm-default'
has been removed. #3232
Changes since v2.12.0
---------------------
* Augmenting a file- or blob-visiting buffer with blame information
was completely rewritten, making the implementation more robust and
adding many new features. It is now possible blame in order to get
an answer to the question "what commits remove these lines". It is
no longer necessary for the buffer to be put into `read-only-mode',
when displaying blame information. New visualization styles were
added and users can define their own styles. New commands to visit
blobs related to the current chunk were added.
* Added new command `magit-tag-release'. This is a fairly opinionated
command and its only use to you might be to serve as a template for
your own variant.
* Added new section inserter `magit-insert-ignored-files', which
could be added to `magit-status-sections-hook'.
* The mode `global-magit-file-mode' is now enabled by default, making
the `magit-file-popup' available on "C-c M-g". 0ec28b97
* Added new commands `magit-log-trace-definition' and
`magit-diff-trace-definition', which show a log with diffs about the
definition at point. #2588
* Added new commands `magit-edit-line-commit' and
`magit-diff-edit-hunk-commit', which allow editing the commit that
added the line at point. febe79ba 22b13337
* The interactive prompts for the various reset commands now indicate
the branch which is going to be reset. #3438
* Added new option `magit-published-branches', providing an additional
safety-net. If you try to modify a commit that has been pushed to
one of these branches already, then you are now being asked whether
you really want to do that. Do not rely on this exclusively, there
are edge-cases that are ambiguous and are not always handled as you
might have expected. add4a7f3 ff
* Gravatar images are now being inserted asynchronously. #3452
* After deleting the current worktree, `magit-delete-worktree' now
shows the status buffer for another worktree. d9cd4611
* Added new command `magit-worktree-checkout-pull-request'. a3d788ec
* New variable `magit-get-previous-branch-timeout' limits the amount
of time spent in `magit-get-previous-branch'. #3457
Fixes since v2.12.0
-------------------
* The recently added command `magit-branch-pull-request' had various
issues concerning pull-requests referencing branches from the
upstream repository. #3416 #3417 #3461
* The values of diffstat sections was wrong for sections that
represent renamed files. 66d9558f
* Time zones were not handled correctly when calculating times for
blame headings. #3443
This release also contains the fixes described in the v2.12.1 release
notes, as well as other minor improvements, bug fixes, typo fixes, and
documentation fixes.
Authors
-------
138 Jonas Bernoulli
6 Kyle Meyer
2 Alban Gruin
2 Basil L. Contovounesios
2 Buster Copley
2 Christophe Junke
2 Mario Rodas
2 Phil Sainty
1 Aaron Madlon-Kay
1 Ben North
1 Dean Kariniemi
1 Eli Barzilay
1 Jon Vanderwijk
1 Jonathan Leech-Pepin
1 Justin Guenther
1 Li-Yun Chang
1 Marc Sherry
1 Noam Postavsky
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -8,13 +8,11 @@ include default.mk
test test-interactive magit \
clean clean-lisp clean-docs clean-archives \
stats bump-version melpa-post-release \
dist magit-$(VERSION).tar.gz
dist versionlib magit-$(VERSION).tar.gz
all: lisp docs
help:
$(info )
$(info Current version: magit-$(VERSION))
$(info )
$(info See default.mk for variables you might want to set.)
$(info )
......@@ -60,10 +58,9 @@ help:
$(info make texi - regenerate texi from org)
$(info make stats - regenerate statistics)
$(info make authors - regenerate AUTHORS.md)
$(info make preview-stats - preview statistics)
$(info make publish-stats - publish statistics)
$(info make preview-manuals - preview manuals)
$(info make publish-manuals - publish manuals)
$(info make publish-manuals - publish snapshot manuals)
$(info make release-manuals - publish release manuals)
$(info make dist - create tarballs)
$(info make bump-versions - bump versions for release)
$(info make bump-snapshots - bump versions after release)
......@@ -106,6 +103,7 @@ install-info: info
test:
@$(BATCH) --eval "(progn\
$$suppress_warnings\
(load-file \"t/magit-tests.el\")\
(ert-run-tests-batch-and-exit))"
......@@ -135,7 +133,7 @@ clean-docs:
@$(MAKE) -C Documentation clean
clean-archives:
@$(RM) git-commit-*.el *.tar.gz *.tar
@$(RM) *.tar.gz *.tar lisp/magit-version.el
@$(RMDIR) magit-$(VERSION)
clean-all: clean clean-stats
......@@ -154,28 +152,28 @@ stats:
authors:
@$(MAKE) -C Documentation authors
preview-stats:
@$(MAKE) -C Documentation preview-stats
publish-stats:
@$(MAKE) -C Documentation publish-stats
preview-manuals:
@$(MAKE) -C Documentation preview-manuals
publish-manuals:
@$(MAKE) -C Documentation publish-manuals
release-manuals:
@$(MAKE) -C Documentation release-manuals
dist: magit-$(VERSION).tar.gz
DIST_ROOT_FILES = COPYING default.mk Makefile README.md
versionlib:
@$(MAKE) -C lisp versionlib
DIST_ROOT_FILES = LICENSE default.mk Makefile README.md
DIST_LISP_FILES = $(addprefix lisp/,$(ELS) magit-version.el Makefile)
DIST_DOCS_FILES = $(addprefix Documentation/,$(TEXIPAGES) AUTHORS.md Makefile)
ifneq ("$(wildcard Documentation/RelNotes/$(VERSION).txt)","")
DIST_DOCS_FILES += Documentation/RelNotes/$(VERSION).txt
endif
magit-$(VERSION).tar.gz: lisp info
magit-$(VERSION).tar.gz: lisp versionlib info
@printf "Packing $@\n"
@$(MKDIR) magit-$(VERSION)
@$(CP) $(DIST_ROOT_FILES) magit-$(VERSION)
......@@ -187,53 +185,65 @@ magit-$(VERSION).tar.gz: lisp info
@$(RMDIR) magit-$(VERSION)
define set_package_requires
(require (quote dash))
(dolist (lib (list "git-commit" "magit-popup" "magit"))
(with-current-buffer (find-file-noselect (format "lisp/%s.el" lib))
(goto-char (point-min))
(re-search-forward "^;; Package-Requires: ")
(let ((s (read (buffer-substring (point) (line-end-position)))))
(--when-let (assq (quote async) s) (setcdr it (list async-version)))
(--when-let (assq (quote dash) s) (setcdr it (list dash-version)))
(--when-let (assq (quote with-editor) s) (setcdr it (list with-editor-version)))
(--when-let (assq (quote git-commit) s) (setcdr it (list git-commit-version)))
(--when-let (assq (quote magit-popup) s) (setcdr it (list magit-popup-version)))
(delete-region (point) (line-end-position))
(insert (format "%S" s))
(save-buffer))))
(with-temp-file "lisp/git-commit.el"
(insert-file-contents "lisp/git-commit.el")
(re-search-forward "^;; Package-Requires: ")
(delete-region (point) (line-end-position))
(insert (format "%S"
`((emacs "24.4") ;`
(dash ,dash-version)
(with-editor ,with-editor-version))))
(with-temp-file "lisp/magit-pkg.el"
(insert (pp-to-string
`(define-package "magit" "2.12.0" ;`
"A Git porcelain inside Emacs."
'((emacs "24.4") ;'
(async ,async-version)
(dash ,dash-version)
(ghub ,ghub-version)
(git-commit ,git-commit-version)
(let-alist ,let-alist-version)
(magit-popup ,magit-popup-version)
(with-editor ,with-editor-version)))))
(goto-char (point-min))
(re-search-forward " \"A")
(goto-char (match-beginning 0))
(insert "\n ")))
endef
export set_package_requires
define set_manual_version
(let ((version (split-string "$(MAGIT_VERSION)" "\\.")))
(setq version (concat (car version) "." (cadr version)))
(dolist (file (list "magit-popup" "magit"))
(with-current-buffer (find-file-noselect (format "Documentation/%s.org" file))
(goto-char (point-min))
(re-search-forward "^#\\+SUBTITLE: for version ")
(delete-region (point) (line-end-position))
(insert version)
(save-buffer))))
endef
export set_manual_version
bump-versions: bump-versions-1 texi
bump-versions-1:
@$(BATCH) --eval "(progn\
(setq async-version \"$(ASYNC_VERSION)\")\
(setq dash-version \"$(DASH_VERSION)\")\
(setq with-editor-version \"$(WITH_EDITOR_VERSION)\")\
(setq git-commit-version \"$(GIT_COMMIT_VERSION)\")\
(setq magit-popup-version \"$(MAGIT_POPUP_VERSION)\")\
$$set_package_requires\
$$set_manual_version)"
@$(BATCH) --eval "(let (\
(async-version \"$(ASYNC_VERSION)\")\
(dash-version \"$(DASH_VERSION)\")\
(ghub-version \"$(GHUB_VERSION)\")\
(git-commit-version \"$(GIT_COMMIT_VERSION)\")\
(let-alist-version \"$(LET_ALIST_VERSION)\")\
(magit-popup-version \"$(MAGIT_POPUP_VERSION)\")\
(with-editor-version \"$(WITH_EDITOR_VERSION)\"))\
$$set_package_requires)"
bump-snapshots:
@$(BATCH) --eval "(progn\
(setq async-version \"$(ASYNC_MELPA_SNAPSHOT)\")\
(setq dash-version \"$(DASH_MELPA_SNAPSHOT)\")\
(setq with-editor-version \"$(WITH_EDITOR_MELPA_SNAPSHOT)\")\
(setq git-commit-version \"$(GIT_COMMIT_MELPA_SNAPSHOT)\")\
(setq magit-popup-version \"$(MAGIT_POPUP_MELPA_SNAPSHOT)\")\
@$(BATCH) --eval "(let (\
(async-version \"$(ASYNC_MELPA_SNAPSHOT)\")\
(dash-version \"$(DASH_MELPA_SNAPSHOT)\")\
(ghub-version \"$(GHUB_MELPA_SNAPSHOT)\")\
(git-commit-version \"$(GIT_COMMIT_MELPA_SNAPSHOT)\")\
(let-alist-version \"$(LET_ALIST_VERSION)\")\
(magit-popup-version \"$(MAGIT_POPUP_MELPA_SNAPSHOT)\")\
(with-editor-version \"$(WITH_EDITOR_MELPA_SNAPSHOT)\"))\
$$set_package_requires)"
git commit -a -m "Reset Package-Requires for Melpa"
@git commit -a -m "Reset Package-Requires for Melpa"
define suppress_warnings
(fset 'original-message (symbol-function 'message))
(fset 'message ;'
(lambda (f &rest a)
(unless (or (equal f "Wrote %s")
(equal f "pcase-memoize: equal first branch, yet different")
(and (equal f "Warning: Unknown defun property `%S' in %S")
(memq (car a) '(pure side-effect-free interactive-only))))
(apply 'original-message f a))))
endef
export suppress_warnings
<h1 align="center">
<a href="https://www.kickstarter.com/projects/1681258897/its-magit-the-magical-git-client?ref=ewctvn">
Please support
<img src="https://magit.vc/assets/logo/logo/100x100/magit-logo-100x100px.png"> on
<img src="https://static.kickstarter.com/assets/help/brand_assets/preview-logo-light-0cdfaf3bb32053ed8dae95dcfc4f9f22820257eb01c7c3c5bedab20cddc3f1f4.jpg">
</a>
</h1>
<br><br><br>
<div align="center"><img src="https://magit.vc/assets/magit-168x200px.png"/></div>
<h2 align="center">A Git Porcelain inside Emacs</h2>
<p align="center">
......@@ -16,7 +7,6 @@
<a href="https://github.com/magit/magit/wiki"><b>wiki</b></a> |
<a href="https://groups.google.com/forum/?fromgroups#!forum/magit"><b>mailing list</b></a> |
<a href="https://emacs.stackexchange.com/questions/tagged/magit"><b>forum</b></a> |
<a href="https://gitter.im/magit/magit"><b>chat</b></a> |
<a href="https://twitter.com/magit_emacs"><b>news</b></a>
</p>
<hr>
......@@ -35,28 +25,78 @@
</p>
<hr>
<div align="center">
<a href="https://www.kickstarter.com/projects/1681258897/its-magit-the-magical-git-client/updates">
<img src="https://magit.vc/assets/kickstarter-k.png">
</a>
</div>
<br>
<div align="justify">
Please consider supporting the ongoing
<a href="https://www.kickstarter.com/projects/1681258897/its-magit-the-magical-git-client?ref=ewctvn">
crowd-funding campaign</a>. If it succeeds, then I can work full-time
on Magit for a whole year. I am still overflowing with ideas, and
depend on your support to realize them, and to address the remaining
long-standing issues. It is great that many users already consider
Magit to be one of Emacs' killer applications, but it is still far
from fulfilling its true potential. Only with your help can I get it
there.
Thanks to
<a href="https://github.com/magit/magit/blob/master/Documentation/BACKERS.md">1987 backers</a>
the Kickstarter campaign was a huge success!
This September was very exciting and I would like to thank you all
for your generosity and enthusiastic support!
</div>
<div align="center">
<br>
<em>Thank you! — Jonas Bernoulli</em>
<br><br>
<a href="https://www.kickstarter.com/projects/1681258897/its-magit-the-magical-git-client?ref=ewctvn">
<img src="https://static.kickstarter.com/assets/help/brand_assets/preview-logo-light-0cdfaf3bb32053ed8dae95dcfc4f9f22820257eb01c7c3c5bedab20cddc3f1f4.jpg">
</a>
<em><b>Thank you!</b> &mdash; Jonas Bernoulli</em><br><br>
<img src="https://magit.vc/assets/pixel-heart.png">
</div>
<br>
<div align="center">
<em>My thanks also go to these three sponsors!</em><br><br>
<a href="https://www.mojotech.com">
<img title="Mojotech"
alt="Mojotech"
src="https://magit.vc/assets/mojotech.png"></a>
<a href="https://opensource.google.com">
<img title="Google Open Source"
alt="Google Open Source"
src="https://magit.vc/assets/google-os.png"></a>
<a href="http://www.directangular.com">
<img title="Directangular"
alt="Directangular"
src="https://magit.vc/assets/directangular.png"></a>
</div>
<br>
<hr>
<div align="center">
Keeping its users <a href= "https://magit.vc/quotes">this excited</a> is
<a href="https://magit.vc/stats/authors.html#cumulated_added_lines_of_code_per_author">
a lot of work
</a>.
If Magit makes you <br> more productive too,
then <b>please consider making a donation</b>.
</div>
<div align="center">
<em>Thank you! &mdash; Jonas Bernoulli</em>
</div>
<br>
<div align="center">
<a href="https://www.paypal.me/JonasBernoulli/20">
<img title="Donate using PayPal"
alt="Donate using PayPal"
style="height: 50px; width: auto;"
src="https://magit.vc/assets/paypal.png"></a>
&nbsp;&nbsp;
<a href="https://www.patreon.com/tarsius">
<img title="Donate monthly using Patreon"
alt="Donate monthly using Patreon"
style="height: 50px; width: auto;"
src="https://magit.vc/assets/patreon-50px.png"></a>
&nbsp;&nbsp;
<a href="https://liberapay.com/magit">
<img title="Donate weekly using Liberapay"
alt="Donate weekly using Liberapay"
src="https://magit.vc/assets/liberapay-50px.png"></a>
</div>
<br>
<div align="center">
Some alternative donation methods are <a href="https://magit.vc/donate">available</a>.
</div>
<hr>
Support
=======
......@@ -67,9 +107,9 @@ You should also consult the [manual][manual] and ask a general-purpose
search engine.
If that doesn't answer your question, then ask for help on the
**[Emacs Stackexchange site][forum]**, the [mailing list][list], or
the [Gitter chat][chat]. We only use the GitHub issue tracker for
feature requests and bug reports, so please don't ask for help there.
**[Emacs Stackexchange site][forum]** or the [mailing list][list].
We only use the GitHub issue tracker for feature requests and bug
reports, so please don't ask for help there.
Contributing
============
......@@ -93,9 +133,18 @@ features.
Thanks to all of you, may (the history of) the source be with you!
***
[![GPL v3](https://img.shields.io/badge/license-GPL_v3-green.svg)](http://www.gnu.org/licenses/gpl-3.0.txt)
[![Build Status](https://travis-ci.org/magit/magit.svg?branch=master)](https://travis-ci.org/magit/magit)
[![Melpa](https://melpa.org/packages/magit-badge.svg)](https://melpa.org/#/magit)
[![Melpa Stable](https://stable.melpa.org/packages/magit-badge.svg)](https://stable.melpa.org/#/magit)
[![Git Xkcd](https://img.shields.io/badge/xkcd-git-orange.svg)](https://xkcd.com/1597)
[![Eierlegende Wollmilchsau](https://img.shields.io/badge/eierlegende-Wollmilchsau-green.svg)](https://magit.vc/manual/magit)
[![Swiss Made](https://img.shields.io/badge/swiss-made-red.svg?colorA=E11A27&colorB=555555)](https://magit.vc/stats/authors.html#commits_per_author)
[![Netscape](https://magit.vc/assets/netscape-20px.png)](https://en.wikipedia.org/wiki/Browser_wars)
[![Paren Xkcb](https://img.shields.io/badge/%28-%20%20%20-red.svg)](https://xkcd.com/859)
[contrib]: https://github.com/magit/magit/blob/master/CONTRIBUTING.md
[contrib]: https://github.com/magit/magit/blob/master/Documentation/CONTRIBUTING.md
[issues]: https://github.com/magit/magit/issues
[pulls]: https://github.com/magit/magit/pulls
......@@ -103,7 +152,6 @@ Thanks to all of you, may (the history of) the source be with you!
[faq]: https://magit.vc/manual/magit/FAQ.html
[manual]: https://magit.vc/manual
[chat]: https://gitter.im/magit/magit
[forum]: https://emacs.stackexchange.com/questions/tagged/magit
[list]: https://groups.google.com/forum/?fromgroups#!forum/magit
......
Documentation/RelNotes/2.13.0.txt
\ No newline at end of file
......@@ -35,9 +35,8 @@ MANUAL_HTML_ARGS ?= --css-ref /assets/page.css
## Files #############################################################
PKG = magit
PACKAGES = magit magit-popup git-commit
PACKAGE_VERSIONS = $(addsuffix -$(VERSION),$(PACKAGES))
PKG = magit
PACKAGES = magit git-commit
TEXIPAGES = $(addsuffix .texi,$(filter-out git-commit,$(PACKAGES)))
INFOPAGES = $(addsuffix .info,$(filter-out git-commit,$(PACKAGES)))
......@@ -46,7 +45,6 @@ HTMLDIRS = $(filter-out git-commit,$(PACKAGES))
PDFFILES = $(addsuffix .pdf,$(filter-out git-commit,$(PACKAGES)))
ELS = git-commit.el
ELS += magit-popup.el
ELS += magit-utils.el
ELS += magit-section.el
ELS += magit-git.el
......@@ -64,7 +62,11 @@ ELS += magit.el
ELS += magit-status.el
ELS += magit-refs.el
ELS += magit-files.el
ELS += magit-collab.el
ELS += magit-reset.el
ELS += magit-branch.el
ELS += magit-merge.el
ELS += magit-tag.el
ELS += magit-worktree.el
ELS += magit-notes.el
ELS += magit-obsolete.el
......@@ -87,26 +89,22 @@ ELGS = magit-autoloads.el magit-version.el
## Versions ##########################################################
VERSION := $(shell \
test -e $(TOP).git\
&& git describe --tags --dirty 2> /dev/null\
|| $(BATCH) --eval "(progn\
(fset 'message (lambda (&rest _)))\
(load-file \"magit-version.el\")\
(princ magit-version))")
MAGIT_VERSION = 2.11
ASYNC_VERSION = 1.9.2
DASH_VERSION = 2.13.0
WITH_EDITOR_VERSION = 2.6.0
GIT_COMMIT_VERSION = 2.10.3
MAGIT_POPUP_VERSION = 2.10.3
ASYNC_MELPA_SNAPSHOT = 20170823
DASH_MELPA_SNAPSHOT = 20170810
WITH_EDITOR_MELPA_SNAPSHOT = 20170817
GIT_COMMIT_MELPA_SNAPSHOT = 20170823
MAGIT_POPUP_MELPA_SNAPSHOT = 20170824
VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0)
ASYNC_VERSION = 1.9.3
DASH_VERSION = 2.14.1
GHUB_VERSION = 2.0.1
GIT_COMMIT_VERSION = 2.12.1
LET_ALIST_VERSION = 1.0.5
MAGIT_POPUP_VERSION = 2.12.3
WITH_EDITOR_VERSION = 2.7.3
ASYNC_MELPA_SNAPSHOT = 20180527
DASH_MELPA_SNAPSHOT = 20180413
GHUB_MELPA_SNAPSHOT = 20180417
GIT_COMMIT_MELPA_SNAPSHOT = 20180411
MAGIT_POPUP_MELPA_SNAPSHOT = 20180509
WITH_EDITOR_MELPA_SNAPSHOT = 20180414
EMACS_VERSION = 24.4
......@@ -129,6 +127,20 @@ ifeq "$(DASH_DIR)" ""
DASH_DIR = $(TOP)../dash
endif
GHUB_DIR ?= $(shell \
find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/ghub-[.0-9]*' 2> /dev/null | \
sort | tail -n 1)
ifeq "$(GHUB_DIR)" ""
GHUB_DIR = $(TOP)../ghub
endif
MAGIT_POPUP_DIR ?= $(shell \
find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/magit-popup-[.0-9]*' 2> /dev/null | \
sort | tail -n 1)
ifeq "$(MAGIT_POPUP_DIR)" ""
MAGIT_POPUP_DIR = $(TOP)../magit-popup
endif
WITH_EDITOR_DIR ?= $(shell \
find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/with-editor-[.0-9]*' 2> /dev/null | \
sort | tail -n 1)
......@@ -145,13 +157,21 @@ LOAD_PATH = -L $(TOP)/lisp
ifdef CYGPATH
LOAD_PATH += -L $(shell cygpath --mixed $(DASH_DIR))
LOAD_PATH += -L $(shell cygpath --mixed $(GHUB_DIR))
LOAD_PATH += -L $(shell cygpath --mixed $(MAGIT_POPUP_DIR))
LOAD_PATH += -L $(shell cygpath --mixed $(WITH_EDITOR_DIR))
else
LOAD_PATH += -L $(DASH_DIR)
LOAD_PATH += -L $(GHUB_DIR)
LOAD_PATH += -L $(MAGIT_POPUP_DIR)
LOAD_PATH += -L $(WITH_EDITOR_DIR)
endif
endif # ifndef LOAD_PATH
DOC_LOAD_PATH ?= $(LOAD_PATH) \
-L ../../org/lisp -L ../../org/contrib/lisp -L ../../ox-texinfo+
ifndef ORG_LOAD_PATH
ORG_LOAD_PATH = $(LOAD_PATH)
ORG_LOAD_PATH += -L ../../org/lisp
ORG_LOAD_PATH += -L ../../org/contrib/lisp
ORG_LOAD_PATH += -L ../../ox-texinfo+
endif
......@@ -10,16 +10,15 @@ all: lisp
## Build order #######################################################
git-commit.elc:
magit-popup.elc:
magit-utils.elc:
magit-section.elc: magit-utils.elc
magit-git.elc: magit-utils.elc magit-section.elc
magit-mode.elc: magit-section.elc magit-git.elc magit-popup.elc
magit-mode.elc: magit-section.elc magit-git.elc
magit-margin.elc: magit-section.elc magit-mode.elc
magit-process.elc: magit-utils.elc magit-section.elc \
magit-git.elc magit-mode.elc
magit-autorevert.elc: magit-git.elc magit-process.elc
magit-core.elc: magit-popup.elc magit-margin.elc magit-utils.elc \
magit-core.elc: magit-margin.elc magit-utils.elc \
magit-section.elc magit-git.elc magit-mode.elc \
magit-process.elc magit-autorevert.elc
magit-diff.elc: git-commit.elc magit-core.elc
......@@ -32,27 +31,32 @@ magit.elc: git-commit.elc magit-core.elc magit-diff.elc \
magit-status.elc: magit.elc
magit-refs.elc: magit.elc
magit-files.elc: magit.elc
magit-branch.elc: magit.elc
magit-collab.elc: magit.elc
magit-reset.elc: magit.elc
magit-branch.elc: magit.elc magit-collab.elc magit-reset.elc
magit-merge.elc: magit.elc
magit-tag.elc: magit.elc
magit-worktree.elc: magit.elc
magit-notes.elc: magit.elc
magit-obsolete.elc: magit.elc
magit-sequence.elc: magit.elc
magit-commit.elc: magit.elc magit-sequence.elc
magit-remote.elc: magit.elc
magit-bisect.elc: magit.elc
magit-stash.elc: magit.elc
magit-blame.elc: magit.elc
magit-obsolete.elc: magit.elc
magit-submodule.elc: magit.elc
magit-subtree.elc: magit.elc
magit-ediff.elc: magit.elc
magit-extras.elc: magit.elc
magit-extras.elc: magit.elc magit-merge.elc
git-rebase.elc: magit.elc
magit-imenu.elc: magit.elc git-rebase.elc
magit-bookmark.elc: magit.elc
magit-obsolete.elc: magit.elc
## Build #############################################################
lisp: $(ELCS) loaddefs versionlib
lisp: $(ELCS) loaddefs
loaddefs: $(PKG)-autoloads.el
versionlib: $(PKG)-version.el
......@@ -62,10 +66,7 @@ versionlib: $(PKG)-version.el
(when (file-exists-p \"$@\")\
(delete-file \"$@\"))\
(setq with-editor-emacsclient-executable nil)\
(fset 'message* (symbol-function 'message))\
(fset 'message (lambda (f &rest a)\
(unless (equal f \"Wrote %s\")\
(apply 'message* f a)))))" \
$$suppress_warnings)" \
-f batch-byte-compile $<
$(PKG)-autoloads.el: $(ELS)
......@@ -86,7 +87,7 @@ $(PKG)-version.el:
## Install ###########################################################
install: lisp
install: lisp versionlib
@$(MKDIR) $(DESTDIR)$(lispdir)
$(CP) $(ELS) magit-autoloads.el magit-version.el $(ELCS) $(DESTDIR)$(lispdir)
......
This diff is collapsed.
;;; git-rebase.el --- Edit Git rebase files -*- lexical-binding: t -*-
;; Copyright (C) 2010-2017 The Magit Project Contributors
;; Copyright (C) 2010-2018 The Magit Project Contributors
;;
;; You should have received a copy of the AUTHORS.md file which
;; lists all contributors. If not, see http://magit.vc/authors.
......@@ -191,6 +191,7 @@
["Squash" git-rebase-squash t]
["Fixup" git-rebase-fixup t]
["Kill" git-rebase-kill-line t]
["Noop" git-rebase-noop t]
["Execute" git-rebase-exec t]
["Move Down" git-rebase-move-line-down t]
["Move Up" git-rebase-move-line-up t]
......@@ -474,7 +475,9 @@ running 'man git-rebase' at the command line) for details."
(unless git-rebase-show-instructions
(let ((inhibit-read-only t))
(flush-lines git-rebase-comment-re)))
(with-editor-mode 1)
(unless with-editor-mode
;; Maybe already enabled when using `shell-command' or an Emacs shell.
(with-editor-mode 1))
(when git-rebase-confirm-cancel
(add-hook 'with-editor-cancel-query-functions
'git-rebase-cancel-confirm nil t))
......@@ -492,7 +495,7 @@ running 'man git-rebase' at the command line) for details."
(defun git-rebase-cancel-confirm (force)
(or (not (buffer-modified-p))
force
(magit-confirm 'abort-rebase "Abort this rebase")))
(magit-confirm 'abort-rebase "Abort this rebase" nil 'noabort)))
(defun git-rebase-autostash-save ()
(--when-let (magit-file-line (magit-git-dir "rebase-merge/autostash"))
......@@ -516,9 +519,13 @@ running 'man git-rebase' at the command line) for details."
("^\\(exec\\) \\(.*\\)"
(1 'font-lock-keyword-face)
(2 'git-rebase-description))
("^\\(noop\\)"
(1 'font-lock-keyword-face))
(git-rebase-match-comment-line 0 'font-lock-comment-face)
(,(concat git-rebase-comment-re " *" action-re)
0 'git-rebase-killed-action t)
("\\[[^[]*\\]"
0 'magit-keyword t)
(,(format "^%s Rebase \\([^ ]*\\) onto \\([^ ]*\\)" comment-start)
(1 'git-rebase-comment-hash t)
(2 'git-rebase-comment-hash t))
......@@ -535,15 +542,17 @@ By default, this is the same except for the \"pick\" command."
(goto-char (point-min))
(when (and git-rebase-show-instructions
(re-search-forward
(concat git-rebase-comment-re " Commands:\n")
(concat git-rebase-comment-re "\\s-+p, pick")
nil t))
(goto-char (line-beginning-position))
(--each git-rebase-command-descriptions
(insert (format "%s %-8s %s\n"
comment-start
(substitute-command-keys (format "\\[%s]" (car it)))
(cdr it))))
(while (re-search-forward (concat git-rebase-comment-re
"\\( ?\\)\\([^,],\\) \\([^ ]+\\) = ")
"\\( ?\\)\\([^\n,],\\) "
"\\([^\n ]+\\) ")
nil t)
(let ((cmd (intern (concat "git-rebase-" (match-string 3)))))
(if (not (fboundp cmd))
......@@ -552,7 +561,7 @@ By default, this is the same except for the \"pick\" command."
(replace-match
(format "%-8s"
(mapconcat #'key-description
(--filter (not (eq (elt it 0) 'menu-bar))
(--remove (eq (elt it 0) 'menu-bar)
(reverse (where-is-internal cmd)))
", "))
t t nil 2))))))))
......
This diff is collapsed.
;;; magit-autorevert.el --- revert buffers when files in repository change -*- lexical-binding: t -*-
;; Copyright (C) 2010-2017 The Magit Project Contributors
;; Copyright (C) 2010-2018 The Magit Project Contributors
;;
;; You should have received a copy of the AUTHORS.md file which
;; lists all contributors. If not, see http://magit.vc/authors.
......@@ -110,8 +110,10 @@ seconds of user inactivity. That is not desirable."
(file-readable-p buffer-file-name)
(magit-toplevel)
(or (not magit-auto-revert-tracked-only)
(magit-file-tracked-p buffer-file-name)))
(auto-revert-mode))))
(magit-file-tracked-p buffer-file-name))
(not auto-revert-mode) ; see #3014
(not global-auto-revert-mode)) ; see #3460
(auto-revert-mode 1))))
;;;###autoload
(defvar magit-revert-buffers t) ; obsolete
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
;;; magit-core.el --- core functionality -*- lexical-binding: t -*-
;; Copyright (C) 2010-2017 The Magit Project Contributors
;; Copyright (C) 2010-2018 The Magit Project Contributors
;;
;; You should have received a copy of the AUTHORS.md file which
;; lists all contributors. If not, see http://magit.vc/authors.
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.