]> code.delx.au - gnu-emacs/history - admin/gitmerge.el
delx.au / code / gnu-emacs / history
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge from origin/emacs-25
[gnu-emacs] / admin / gitmerge.el
2016-04-18 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw
2016-04-12 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw
2016-04-11 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw
2016-04-11 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw
2016-04-11 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw
2016-04-11 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw
2016-04-11 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw
2016-04-03 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw
2016-04-03 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw
2016-04-03 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw
2016-04-02 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw
2016-04-02 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw
2016-04-02 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw
2016-04-02 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw
2016-03-23 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw
2016-03-23 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw
2016-03-23 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw
2016-03-22 Paul EggertCompute a better commit message for merges blob | commitdiff | raw
2016-03-22 Paul Eggert* admin/gitmerge.el (gitmerge-skip-regexp): Add "no... blob | commitdiff | raw | diff to current
2016-03-22 Paul EggertChange do-not-merge pattern to "do not merge" blob | commitdiff | raw | diff to current
2016-03-22 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-22 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-22 Paul Eggert- blob | commitdiff | raw | diff to current
2016-03-22 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-22 Paul Eggert- blob | commitdiff | raw | diff to current
2016-03-22 Paul EggertKeep "merge" commits by default in gitmerge blob | commitdiff | raw | diff to current
2016-03-11 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-11 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-11 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-11 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-03-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-22 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-15 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-15 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-15 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-15 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-15 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-15 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-15 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-09 Paul Eggert- blob | commitdiff | raw | diff to current
2016-02-09 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-09 Paul Eggert- blob | commitdiff | raw | diff to current
2016-02-09 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-09 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-09 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-09 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-09 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-09 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-09 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-09 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-04 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-02-04 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert- blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert- blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert- blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-30 Paul EggertMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert- blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-30 Paul Eggert- blob | commitdiff | raw | diff to current
2016-01-19 John Wiegley- blob | commitdiff | raw | diff to current
2016-01-19 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-19 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-19 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-19 John Wiegley- blob | commitdiff | raw | diff to current
2016-01-14 K. HandaMerge branch 'master' of git.sv.gnu.org:/srv/git/emacs blob | commitdiff | raw | diff to current
2016-01-12 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-12 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-12 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-12 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-12 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-12 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-12 John WiegleyMerge from origin/emacs-25 blob | commitdiff | raw | diff to current
2016-01-12 John Wiegley; Merge from origin/emacs-25 blob | commitdiff | raw | diff to current
next