summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-05-231-2/+2
|\ \ \ \
| * | | | pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin2018-04-261-1/+1
| * | | | rebase: introduce the --rebase-merges optionJohannes Schindelin2018-04-261-1/+1
* | | | | Merge branch 'js/deprecate-grafts'Junio C Hamano2018-05-231-28/+0
|\ \ \ \ \
| * | | | | Remove obsolete script to convert grafts to replace refsJohannes Schindelin2018-04-301-28/+0
| |/ / / /
* | | | | Merge branch 'ds/lazy-load-trees'Junio C Hamano2018-05-231-0/+28
|\ \ \ \ \
| * | | | | coccinelle: avoid wrong transformation suggestions from commit.cocciSZEDER Gábor2018-05-021-6/+4
| * | | | | treewide: replace maybe_tree with accessor methodsDerrick Stolee2018-04-111-0/+30
| * | | | | Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano2018-04-111-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'tg/demote-stash-save-in-completion'Junio C Hamano2018-05-081-2/+10
|\ \ \ \ \ \ \
| * | | | | | | completion: make stash -p and alias for stash push -pThomas Gummerer2018-04-201-0/+3
| * | | | | | | completion: stop showing 'save' for stash by defaultThomas Gummerer2018-04-201-2/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sg/completion-clear-cached'Junio C Hamano2018-05-081-1/+5
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | completion: reduce overhead of clearing cached --optionsSZEDER Gábor2018-04-181-1/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ab/nuke-emacs-contrib'Junio C Hamano2018-05-085-2228/+25
|\ \ \ \ \ \
| * | | | | | git{,-blame}.el: remove old bitrotting Emacs codeÆvar Arnfjörð Bjarmason2018-04-165-2228/+25
* | | | | | | Merge branch 'ds/commit-graph'Junio C Hamano2018-05-081-0/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | commit-graph: create git-commit-graph builtinDerrick Stolee2018-04-021-0/+2
* | | | | | | Merge branch 'ab/simplify-perl-makefile'Junio C Hamano2018-05-081-2/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | perl: fix installing modules from contribChristian Hesse2018-04-111-2/+3
* | | | | | | Merge branch 'sb/filenames-with-dashes'Junio C Hamano2018-04-252-4/+4
|\ \ \ \ \ \ \
| * | | | | | | unicode_width.h: rename to use dash in file nameStefan Beller2018-04-112-4/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'cb/bash-completion-ls-files-processing'Junio C Hamano2018-04-251-6/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | completion: improve ls-files filter performanceClemens Buchacher2018-04-101-6/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ab/drop-contrib-examples'Junio C Hamano2018-04-1127-8137/+20
|\ \ \ \ \ \
| * | | | | | Remove contrib/examples/*ab/drop-contrib-examplesÆvar Arnfjörð Bjarmason2018-03-2627-8137/+20
* | | | | | | Merge branch 'nd/parseopt-completion-more'Junio C Hamano2018-04-101-19/+56
|\ \ \ \ \ \ \
| * | | | | | | completion: use __gitcomp_builtin in _git_cherrynd/parseopt-completion-moreNguyễn Thái Ngọc Duy2018-03-251-0/+6
| * | | | | | | completion: use __gitcomp_builtin in _git_ls_treeNguyễn Thái Ngọc Duy2018-03-251-0/+7
| * | | | | | | completion: delete option-only completion commandsNguyễn Thái Ngọc Duy2018-03-251-15/+0
| * | | | | | | completion: add --option completion for most builtin commandsNguyễn Thái Ngọc Duy2018-03-251-0/+28
| * | | | | | | completion: factor out _git_xxx calling codeNguyễn Thái Ngọc Duy2018-03-251-4/+13
| * | | | | | | completion: mention the oldest version we need to supportNguyễn Thái Ngọc Duy2018-03-251-0/+2
* | | | | | | | Merge branch 'jk/diff-highlight-graph-fix'Junio C Hamano2018-04-102-37/+129
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | diff-highlight: detect --graph by indentjk/diff-highlight-graph-fixJeff King2018-03-212-15/+91
| * | | | | | | diff-highlight: use flush() helper consistentlyJeff King2018-03-211-4/+3
| * | | | | | | diff-highlight: test graphs with --colorJeff King2018-03-211-0/+9
| * | | | | | | diff-highlight: test interleaved parallel lines of historyJeff King2018-03-211-7/+15
| * | | | | | | diff-highlight: prefer "echo" to "cat" in testsJeff King2018-03-211-8/+4
| * | | | | | | diff-highlight: use test_tick in graph testJeff King2018-03-211-7/+11
| * | | | | | | diff-highlight: correct test graph diagramJeff King2018-03-211-2/+2
* | | | | | | | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-281-0/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | completion: clear cached --options when sourcing the completion scriptSZEDER Gábor2018-03-221-0/+4
* | | | | | | Merge branch 'tz/complete-tag-delete-tagname'Junio C Hamano2018-03-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | completion: complete tags with git tag --delete/--verifytz/complete-tag-delete-tagnameTodd Zullinger2018-03-191-1/+1
* | | | | | | | Merge branch 'ab/perl-fixes'Junio C Hamano2018-03-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | perl: move CPAN loader wrappers to another namespaceÆvar Arnfjörð Bjarmason2018-03-051-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'cl/send-email-reply-to'Junio C Hamano2018-03-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | send-email: support separate Reply-To addresscl/send-email-reply-toChristian Ludwig2018-03-061-1/+1
* | | | | | | | | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-141-194/+112
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |