aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'mc/push-recurse-submodules-config'Junio C Hamano2015-12-21
|\
| * push: follow the "last one wins" convention for --recurse-submodulesMike Crowe2015-12-04
| * push: test that --recurse-submodules on command line overrides configMike Crowe2015-12-04
| * push: add recurseSubmodules config optionMike Crowe2015-11-20
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2015-12-21
|\ \
| * \ Merge branch 'ja.po' of https://github.com/qykth-git/gitkPaul Mackerras2015-12-19
| |\ \
| | * | gitk: Update revision date in Japanese PO fileYOKOTA Hiroshi2015-11-12
| | * | gitk: Update "Language:" headerYOKOTA Hiroshi2015-11-12
| | * | gitk: Improve translation messageYOKOTA Hiroshi2015-11-12
| | * | gitk: Remove unused lineYOKOTA Hiroshi2015-11-12
| | * | gitk: Update yearYOKOTA Hiroshi2015-11-12
| | * | gitk: Change last translator lineYOKOTA Hiroshi2015-11-12
| | * | gitk: Update fuzzy messagesYOKOTA Hiroshi2015-11-12
| | * | gitk: Update Japanese translationYOKOTA Hiroshi2015-11-12
| | * | gitk: Fix translation around copyright signYOKOTA Hiroshi2015-11-12
| | * | gitk: Update Japanese translationYOKOTA Hiroshi2015-11-12
| | * | gitk: Fix wrong translationYOKOTA Hiroshi2015-11-12
| | * | gitk: Translate Japanese catalogYOKOTA Hiroshi2015-11-12
| | * | gitk: Translate more to Japanese catalogYOKOTA Hiroshi2015-11-12
| | * | gitk: Update Japanese message catalogYOKOTA Hiroshi2015-11-12
| | * | gitk: Re-sync line number in Japanese message catalogueYOKOTA Hiroshi2015-11-12
| * | | Merge branch 'color-fix' of https://github.com/qykth-git/gitkPaul Mackerras2015-12-19
| |\ \ \
| | * | | gitk: Color name updateYOKOTA Hiroshi2015-11-12
| | |/ /
| * | | gitk: sv.po: Update Swedish translation (311t)Peter Krefting2015-12-12
| * | | gitk: Let .bleft.mid widgets 'breathe'Giuseppe Bilotta2015-12-12
| * | | gitk: Match ttk fonts to gitk fontsGiuseppe Bilotta2015-12-12
| |/ /
* | | Merge branch 'fr/rebase-i-continue-preserve-options'Junio C Hamano2015-12-16
|\ \ \
| * | | rebase -i: remember merge options beyond continue actionsFabian Ruch2015-12-11
* | | | Merge branch 'maint'Junio C Hamano2015-12-16
|\ \ \ \
| * \ \ \ Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-16
| |\ \ \ \
| | * | | | credential-store: don't pass strerror to die_errno()SZEDER Gábor2015-12-16
* | | | | | Git 2.7-rc1v2.7.0-rc1Junio C Hamano2015-12-15
* | | | | | Sync with maintJunio C Hamano2015-12-15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update draft release notes to 2.6.5Junio C Hamano2015-12-15
| * | | | | Merge branch 'dt/fsck-verify-pack-error' into maintJunio C Hamano2015-12-15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ep/ident-with-getaddrinfo' into maintJunio C Hamano2015-12-15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ls/p4-keep-empty-commits' into maintJunio C Hamano2015-12-15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/prune-mtime' into maintJunio C Hamano2015-12-15
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/send-email-complete-aliases'Junio C Hamano2015-12-15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | completion: fix completing unstuck email alias argumentsSZEDER Gábor2015-12-14
* | | | | | | | | | Merge branch 'ep/ident-with-getaddrinfo'Junio C Hamano2015-12-15
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | ident: fix undefined variable when NO_IPV6 is setJeff King2015-12-14
* | | | | | | | | | Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-15
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | git-p4: add option to keep empty commitsLars Schneider2015-12-10
* | | | | | | | | | Merge branch 'jk/prune-mtime'Junio C Hamano2015-12-15
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | prune: close directory earlier during loose-object directory traversalJohannes Sixt2015-08-12
* | | | | | | | | | Update release notes to 2.7Junio C Hamano2015-12-11
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2015-12-11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Prepare for 2.6.5Junio C Hamano2015-12-11
| * | | | | | | | | Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \ \ \ \ \