aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.8.2-rc1v1.8.2-rc1Gravatar Junio C Hamano 2013-02-252-14/+10
* Merge git://github.com/git-l10n/git-poGravatar Junio C Hamano 2013-02-254-948/+1200
|\
| * l10n: vi.po: Updated 5 new messages (2009t0f0u)Gravatar Tran Ngoc Quan 2013-02-201-112/+143
| * l10n: Update Swedish translation (2009t0f0u)Gravatar Peter Krefting 2013-02-191-101/+130
| * l10n: Update Swedish translation (2004t0f0u)Gravatar Peter Krefting 2013-02-191-620/+765
| * l10n: zh_CN.po: translate 5 new messagesGravatar Jiang Xin 2013-02-191-106/+128
| * l10n: git.pot: v1.8.2 round 3 (5 new)Gravatar Jiang Xin 2013-02-191-100/+125
* | Sync with 'maint'Gravatar Junio C Hamano 2013-02-253-2/+39
|\ \
| * | Prepare for 1.8.1.5Gravatar Junio C Hamano 2013-02-252-1/+38
| * | Merge branch 'jc/mention-tracking-for-pull-default' into maintGravatar Junio C Hamano 2013-02-251-1/+2
| |\ \
| * \ \ Merge branch 'mm/config-intro-in-git-doc' into maintGravatar Junio C Hamano 2013-02-251-6/+5
| |\ \ \
| * \ \ \ Merge branch 'da/p4merge-mktemp-fix' into maintGravatar Junio C Hamano 2013-02-251-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'bw/get-tz-offset-perl' into maintGravatar Junio C Hamano 2013-02-254-13/+35
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'al/mergetool-printf-fix' into maintGravatar Junio C Hamano 2013-02-252-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jx/utf8-printf-width' into maintGravatar Junio C Hamano 2013-02-253-2/+25
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mg/bisect-doc' into maintGravatar Junio C Hamano 2013-02-251-1/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sp/smart-http-content-type-check' into maintGravatar Junio C Hamano 2013-02-258-17/+59
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/combine-diff-many-parents' into maintGravatar Junio C Hamano 2013-02-252-14/+31
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/apply-similaritly-parsing' into maintGravatar Junio C Hamano 2013-02-251-4/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/remote-helpers-doc' into maintGravatar Junio C Hamano 2013-02-255-7/+23
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/gitweb-use-same-scheme' into maintGravatar Junio C Hamano 2013-02-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'zk/clean-report-failure' into maintGravatar Junio C Hamano 2013-02-251-29/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintGravatar Junio C Hamano 2013-02-251-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/p4merge-mktemp' into maintGravatar Junio C Hamano 2013-02-251-14/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Documentation: "advice" is uncountableGravatar Greg Price 2013-02-252-2/+2
* | | | | | | | | | | | | | | | | | Merge branch 'wk/user-manual'Gravatar Junio C Hamano 2013-02-251-56/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | user-manual: Flesh out uncommitted changes and submodule updatesGravatar W. Trevor King 2013-02-191-1/+3
| * | | | | | | | | | | | | | | | | | user-manual: Use request-pull to generate "please pull" textGravatar W. Trevor King 2013-02-191-9/+5
| * | | | | | | | | | | | | | | | | | user-manual: Reorganize the reroll sections, adding 'git rebase -i'Gravatar W. Trevor King 2013-02-191-46/+69
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/less-reconfigure'Gravatar Junio C Hamano 2013-02-251-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Makefile: avoid infinite loop on configure.ac changeGravatar Jeff King 2013-02-201-6/+8
* | | | | | | | | | | | | | | | | | | | Merge branch 'as/check-ignore'Gravatar Junio C Hamano 2013-02-253-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | name-hash: allow hashing an empty stringGravatar Junio C Hamano 2013-02-193-3/+8
| * | | | | | | | | | | | | | | | | | | | t0008: document test_expect_success_multiGravatar Adam Spiers 2013-02-191-0/+10
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ct/autoconf-htmldir'Gravatar Junio C Hamano 2013-02-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Bugfix: undefined htmldir in config.mak.autogenGravatar Jiang Xin 2013-02-191-0/+2
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'wk/man-deny-current-branch-is-default-these-days'Gravatar Junio C Hamano 2013-02-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | user-manual: typofix (ofthe->of the)Gravatar Junio C Hamano 2013-02-181-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Sync with v1.8.1.4Gravatar Junio C Hamano 2013-02-193-3/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Git 1.8.1.4v1.8.1.4Gravatar Junio C Hamano 2013-02-194-3/+15
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'ob/imap-send-ssl-verify' into maintGravatar Junio C Hamano 2013-02-191-2/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | imap-send: support subjectAltName as wellGravatar Oswald Buddenhagen 2013-02-191-0/+19
| | * | | | | | | | | | | | | | | | | | | | imap-send: the subject of SSL certificate must match the hostGravatar Oswald Buddenhagen 2013-02-191-0/+39
| | * | | | | | | | | | | | | | | | | | | | imap-send: move #ifdef aroundGravatar Junio C Hamano 2013-02-181-2/+7
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/mention-tracking-for-pull-default'Gravatar Junio C Hamano 2013-02-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | doc: mention tracking for pull.defaultGravatar Junio C Hamano 2013-01-311-1/+2
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/config-intro-in-git-doc'Gravatar Junio C Hamano 2013-02-181-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | git.txt: update description of the configuration mechanismGravatar Matthieu Moy 2013-02-151-6/+5
* | | | | | | | | | | | | | | | | | | | | | RelNotes 1.8.2: push-simple will not be in effect in this releaseGravatar Junio C Hamano 2013-02-181-2/+14
* | | | | | | | | | | | | | | | | | | | | | shell-prompt: clean up nested if-thenGravatar Martin Erik Werner 2013-02-181-14/+13