summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2015-12-111-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | l10n: fr.po: Fix typoAudric Schiltknecht2015-12-041-1/+1
| | | * | | | | | | | l10n: fr.po: Fix typoÉlie Bouttier2015-11-041-1/+1
* | | | | | | | | | | Git 2.7-rc2v2.7.0-rc2Junio C Hamano2015-12-222-1/+4
* | | | | | | | | | | Merge branch 'js/emu-write-epipe-on-windows'Junio C Hamano2015-12-222-0/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mingw: emulate write(2) that fails with a EPIPEjs/emu-write-epipe-on-windowsJohannes Schindelin2015-12-212-0/+20
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | push: don't mark options of recurse-submodules for translationRalf Thielow2015-12-221-1/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Update release notes to 2.7Junio C Hamano2015-12-211-2/+29
* | | | | | | | | | Merge branch 'bc/format-patch-null-from-line'Junio C Hamano2015-12-217-1/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: check that header line has expected formatbc/format-patch-null-from-linebrian m. carlson2015-12-151-0/+7
| * | | | | | | | | | format-patch: add an option to suppress commit hashbrian m. carlson2015-12-155-1/+19
| * | | | | | | | | | sha1_file.c: introduce a null_oid constantbrian m. carlson2015-12-142-0/+2
* | | | | | | | | | | Merge branch 'jk/ident-loosen-getpwuid'Junio C Hamano2015-12-213-24/+40
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | ident: loosen getpwuid error in non-strict modejk/ident-loosen-getpwuidJeff King2015-12-141-8/+22
| * | | | | | | | | | ident: keep a flag for bogus default_emailJeff King2015-12-101-7/+12
| * | | | | | | | | | ident: make xgetpwuid_self() a static local helperJeff King2015-12-103-15/+12
* | | | | | | | | | | Merge branch 'jk/send-email-ssl-errors'Junio C Hamano2015-12-211-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | send-email: enable SSL level 1 debug outputjk/send-email-ssl-errorsJohn Keeping2015-12-111-0/+7
* | | | | | | | | | | Merge branch 'sg/completion-no-column'Junio C Hamano2015-12-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | completion: remove 'git column' from porcelain commandssg/completion-no-columnSZEDER Gábor2015-12-111-0/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mc/push-recurse-submodules-config'Junio C Hamano2015-12-217-27/+294
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | push: follow the "last one wins" convention for --recurse-submodulesmc/push-recurse-submodules-configMike Crowe2015-12-042-9/+44
| * | | | | | | | | | push: test that --recurse-submodules on command line overrides configMike Crowe2015-12-041-4/+28
| * | | | | | | | | | push: add recurseSubmodules config optionMike Crowe2015-11-207-26/+234
* | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \