summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* contrib: remove git-convert-objectssb/retire-convert-objects-from-contribStefan Beller2017-01-192-358/+0
* Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2017-01-1815-382/+1901
|\
| * gitk: Remove translated message from commentsDavid Aguilar2017-01-181-15/+0
| * gitk: ru.po: Update Russian translationDimitriy Ryazantcev2016-12-311-314/+356
| * gitk: Update copyright notice to 2016Paul Mackerras2016-12-1214-31/+31
| * gitk: Clear array 'commitinfo' on reloadMarkus Hitter2016-12-121-1/+2
| * gitk: Remove closed file descriptors from $blobdifffdMarkus Hitter2016-12-121-0/+5
| * gitk: Turn off undo manager in the text widgetMarkus Hitter2016-12-121-1/+1
| * gitk: Fix Japanese translation for "marked commit"Satoshi Yasushima2016-12-121-4/+5
| * gitk: Fix missing commits when using -S or -GStefan Dotterweich2016-12-121-1/+4
| * gitk: Use explicit RGB green instead of "lime"Paul Mackerras2016-12-121-6/+6
| * gitk: Add Portuguese translationVasco Almeida2016-12-121-0/+1376
| * gitk: Makefile: create install bin directoryVasco Almeida2016-12-121-0/+1
| * gitk: Include commit title in branch dialogRogier Goossens2016-12-121-1/+6
| * gitk: Allow checking out a remote branchRogier Goossens2016-12-121-5/+31
| * gitk: Add a 'rename' option to the branch context menuRogier Goossens2016-12-121-11/+85
* | RelNotes: drop merge-later comments for maintJunio C Hamano2017-01-171-44/+0
* | Merge branch 'maint'Junio C Hamano2017-01-172-1/+122
|\ \
| * | Almost ready for 2.11.1Junio C Hamano2017-01-174-3/+124
| * | Merge branch 'mm/gc-safety-doc' into maintJunio C Hamano2017-01-172-9/+29
| |\ \
| * \ \ Merge branch 'mm/push-social-engineering-attack-doc' into maintJunio C Hamano2017-01-176-22/+51
| |\ \ \
| * \ \ \ Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maintJunio C Hamano2017-01-171-3/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'ls/filter-process' into maintJunio C Hamano2017-01-174-29/+24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'kh/tutorial-grammofix' into maintJunio C Hamano2017-01-171-6/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'lr/doc-fix-cet' into maintJunio C Hamano2017-01-171-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sb/t3600-cleanup' into maintJunio C Hamano2017-01-171-73/+51
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/readme-gmane-is-no-more' into maintJunio C Hamano2017-01-171-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/unpack-trees-grammofix' into maintJunio C Hamano2017-01-172-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/t0021-fixup' into maintJunio C Hamano2017-01-171-3/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2017-01-171-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/qsort-in-merge-recursive' into maintJunio C Hamano2017-01-171-9/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano2017-01-175-4/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/mingw-winansi-ttyname-termination-fix' into maintJunio C Hamano2017-01-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano2017-01-172-3/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2017-01-171-24/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano2017-01-172-6/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-172-2/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/mailinfo-fold-in-body-headers' into maintJunio C Hamano2017-01-171-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-177-47/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/parseopt-usage-msg-opt' into maintJunio C Hamano2017-01-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano2017-01-175-12/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/shallow-fixup' into maintJunio C Hamano2017-01-171-19/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-173-2/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/mergetool-xxdiff-hotkey' into maintJunio C Hamano2017-01-171-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2017-01-172-4/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/normalize-path-copy-ceil' into maintJunio C Hamano2017-01-171-9/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-173-4/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/difftool-dir-diff-fix' into maintJunio C Hamano2017-01-172-3/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jb/diff-no-index-no-abbrev' into maintJunio C Hamano2017-01-178-1/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-disable-renames-internally' into maintJunio C Hamano2017-01-172-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status