summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2015-12-213-664/+680
|\
| * Merge branch 'ja.po' of https://github.com/qykth-git/gitkPaul Mackerras2015-12-191-356/+336
| |\
| | * gitk: Update revision date in Japanese PO fileYOKOTA Hiroshi2015-11-121-1/+1
| | * gitk: Update "Language:" headerYOKOTA Hiroshi2015-11-121-1/+1
| | * gitk: Improve translation messageYOKOTA Hiroshi2015-11-121-1/+1
| | * gitk: Remove unused lineYOKOTA Hiroshi2015-11-121-18/+0
| | * gitk: Update yearYOKOTA Hiroshi2015-11-121-1/+1
| | * gitk: Change last translator lineYOKOTA Hiroshi2015-11-121-1/+2
| | * gitk: Update fuzzy messagesYOKOTA Hiroshi2015-11-121-9/+2
| | * gitk: Update Japanese translationYOKOTA Hiroshi2015-11-121-1/+1
| | * gitk: Fix translation around copyright signYOKOTA Hiroshi2015-11-121-1/+1
| | * gitk: Update Japanese translationYOKOTA Hiroshi2015-11-121-0/+2
| | * gitk: Fix wrong translationYOKOTA Hiroshi2015-11-121-3/+3
| | * gitk: Translate Japanese catalogYOKOTA Hiroshi2015-11-121-9/+9
| | * gitk: Translate more to Japanese catalogYOKOTA Hiroshi2015-11-121-31/+16
| | * gitk: Update Japanese message catalogYOKOTA Hiroshi2015-11-121-13/+11
| | * gitk: Re-sync line number in Japanese message catalogueYOKOTA Hiroshi2015-11-121-275/+294
| * | Merge branch 'color-fix' of https://github.com/qykth-git/gitkPaul Mackerras2015-12-191-6/+6
| |\ \
| | * | gitk: Color name updateYOKOTA Hiroshi2015-11-121-6/+6
| | |/
| * | gitk: sv.po: Update Swedish translation (311t)Peter Krefting2015-12-121-300/+314
| * | gitk: Let .bleft.mid widgets 'breathe'Giuseppe Bilotta2015-12-121-2/+6
| * | gitk: Match ttk fonts to gitk fontsGiuseppe Bilotta2015-12-121-0/+18
| |/
* | Merge branch 'fr/rebase-i-continue-preserve-options'Junio C Hamano2015-12-162-11/+23
|\ \
| * | rebase -i: remember merge options beyond continue actionsfr/rebase-i-continue-preserve-optionsFabian Ruch2015-12-112-11/+23
* | | Merge branch 'maint'Junio C Hamano2015-12-161-2/+1
|\ \ \
| * \ \ Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-161-2/+1
| |\ \ \
| | * | | credential-store: don't pass strerror to die_errno()sg/lock-file-commit-errorSZEDER Gábor2015-12-161-2/+1
* | | | | Git 2.7-rc1v2.7.0-rc1Junio C Hamano2015-12-152-8/+14
* | | | | Sync with maintJunio C Hamano2015-12-151-0/+14
|\ \ \ \ \ | |/ / / /
| * | | | Update draft release notes to 2.6.5Junio C Hamano2015-12-151-0/+14
| * | | | Merge branch 'dt/fsck-verify-pack-error' into maintJunio C Hamano2015-12-151-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'ep/ident-with-getaddrinfo' into maintJunio C Hamano2015-12-151-4/+27
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ls/p4-keep-empty-commits' into maintJunio C Hamano2015-12-153-17/+165
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/prune-mtime' into maintJunio C Hamano2015-12-151-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jk/send-email-complete-aliases'Junio C Hamano2015-12-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: fix completing unstuck email alias argumentsjk/send-email-complete-aliasesSZEDER Gábor2015-12-141-1/+1
* | | | | | | | | Merge branch 'ep/ident-with-getaddrinfo'Junio C Hamano2015-12-151-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | ident: fix undefined variable when NO_IPV6 is setep/ident-with-getaddrinfoJeff King2015-12-141-1/+1
* | | | | | | | | Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-153-17/+165
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | git-p4: add option to keep empty commitsls/p4-keep-empty-commitsLars Schneider2015-12-103-17/+165
* | | | | | | | | Merge branch 'jk/prune-mtime'Junio C Hamano2015-12-151-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | prune: close directory earlier during loose-object directory traversaljk/prune-mtimeJohannes Sixt2015-08-121-2/+2
* | | | | | | | | Update release notes to 2.7Junio C Hamano2015-12-111-65/+1
* | | | | | | | | Merge branch 'maint'Junio C Hamano2015-12-111-0/+25
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Prepare for 2.6.5Junio C Hamano2015-12-112-1/+26
| * | | | | | | | Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maintJunio C Hamano2015-12-111-1/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-114-5/+8
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-111-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/doc-submodule-sync-recursive' into maintJunio C Hamano2015-12-111-1/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/doc-check-ref-format-typo' into maintJunio C Hamano2015-12-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \