summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* l10n: git.pot: v1.8.2 round 4 (1 changed)Jiang Xin2013-03-051-2/+2
* Merge git://github.com/git-l10n/git-poJunio C Hamano2013-03-041-636/+821
|\
| * l10n: de.po: correct translation of "bisect" messagesRalf Thielow2013-02-261-9/+9
| * l10n: de.po: translate 5 new messagesRalf Thielow2013-02-261-109/+145
| * l10n: de.po: translate 35 new messagesRalf Thielow2013-02-261-618/+767
* | Git 1.8.2-rc2v1.8.2-rc2Junio C Hamano2013-03-032-5/+27
* | Sync with 1.8.1.5Junio C Hamano2013-03-015-6/+16
|\ \
| * | Git 1.8.1.5v1.8.1.5Junio C Hamano2013-03-013-2/+9
| * | Make !pattern in .gitattributes non-fatalThomas Rast2013-03-012-4/+7
| * | Merge branch 'wk/user-manual' into maintJunio C Hamano2013-03-011-56/+77
| |\ \
| * | | Documentation/githooks: Fix linkgitAndrew Wong2013-03-011-1/+1
* | | | Merge branch 'maint'Junio C Hamano2013-02-272-3/+8
|\ \ \ \ | |/ / /
| * | | Update draft release notes to 1.8.1.5Junio C Hamano2013-02-271-1/+5
| * | | Merge branch 'ef/non-ascii-parse-options-error-diag' into maintJunio C Hamano2013-02-271-1/+4
| |\ \ \
| * \ \ \ Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maintJunio C Hamano2013-02-271-3/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'jn/less-reconfigure' into maintJunio C Hamano2013-02-271-6/+8
| |\ \ \ \ \
| * | | | | | Documentation/submodule: Add --force to update synopsisBrad King2013-02-271-1/+1
* | | | | | | Merge branch 'mh/maint-ceil-absolute'Junio C Hamano2013-02-273-16/+52
|\ \ \ \ \ \ \
| * | | | | | | Provide a mechanism to turn off symlink resolution in ceiling pathsMichael Haggerty2013-02-223-16/+52
* | | | | | | | Merge branch 'for-junio' of git://github.com/kusma/gitJunio C Hamano2013-02-261-131/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | wincred: improve compatibility with windows versionsKarsten Blees2013-02-261-129/+70
| * | | | | | | | wincred: accept CRLF on stdin to simplify console usageKarsten Blees2013-02-261-2/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Revert "compat: add strtok_r()"Erik Faye-Lund2013-02-265-80/+0
|/ / / / / / /
* | | | | | | Git 1.8.2-rc1v1.8.2-rc1Junio C Hamano2013-02-252-14/+10
* | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-02-254-948/+1200
|\ \ \ \ \ \ \
| * | | | | | | l10n: vi.po: Updated 5 new messages (2009t0f0u)Tran Ngoc Quan2013-02-201-112/+143
| * | | | | | | l10n: Update Swedish translation (2009t0f0u)Peter Krefting2013-02-191-101/+130
| * | | | | | | l10n: Update Swedish translation (2004t0f0u)Peter Krefting2013-02-191-620/+765
| * | | | | | | l10n: zh_CN.po: translate 5 new messagesJiang Xin2013-02-191-106/+128
| * | | | | | | l10n: git.pot: v1.8.2 round 3 (5 new)Jiang Xin2013-02-191-100/+125
* | | | | | | | Sync with 'maint'Junio C Hamano2013-02-253-2/+39
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Prepare for 1.8.1.5Junio C Hamano2013-02-252-1/+38
| * | | | | | | Merge branch 'jc/mention-tracking-for-pull-default' into maintJunio C Hamano2013-02-251-1/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mm/config-intro-in-git-doc' into maintJunio C Hamano2013-02-251-6/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'da/p4merge-mktemp-fix' into maintJunio C Hamano2013-02-251-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bw/get-tz-offset-perl' into maintJunio C Hamano2013-02-254-13/+35
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'al/mergetool-printf-fix' into maintJunio C Hamano2013-02-252-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/utf8-printf-width' into maintJunio C Hamano2013-02-253-2/+25
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/bisect-doc' into maintJunio C Hamano2013-02-251-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/smart-http-content-type-check' into maintJunio C Hamano2013-02-258-17/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/combine-diff-many-parents' into maintJunio C Hamano2013-02-252-14/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/apply-similaritly-parsing' into maintJunio C Hamano2013-02-251-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/remote-helpers-doc' into maintJunio C Hamano2013-02-255-7/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/gitweb-use-same-scheme' into maintJunio C Hamano2013-02-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'zk/clean-report-failure' into maintJunio C Hamano2013-02-251-29/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintJunio C Hamano2013-02-251-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/p4merge-mktemp' into maintJunio C Hamano2013-02-251-14/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Documentation: "advice" is uncountableGreg Price2013-02-252-2/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'wk/user-manual'Junio C Hamano2013-02-251-56/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | user-manual: Flesh out uncommitted changes and submodule updatesW. Trevor King2013-02-191-1/+3