aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Sync with v1.8.1.4Junio C Hamano2013-02-19
|\
| * Git 1.8.1.4v1.8.1.4Junio C Hamano2013-02-19
| * Merge branch 'ob/imap-send-ssl-verify' into maintJunio C Hamano2013-02-19
| |\
| | * imap-send: support subjectAltName as wellOswald Buddenhagen2013-02-19
| | * imap-send: the subject of SSL certificate must match the hostOswald Buddenhagen2013-02-19
| | * imap-send: move #ifdef aroundJunio C Hamano2013-02-18
* | | Merge branch 'jc/mention-tracking-for-pull-default'Junio C Hamano2013-02-18
|\ \ \
| * | | doc: mention tracking for pull.defaultJunio C Hamano2013-01-31
* | | | Merge branch 'mm/config-intro-in-git-doc'Junio C Hamano2013-02-18
|\ \ \ \
| * | | | git.txt: update description of the configuration mechanismMatthieu Moy2013-02-15
* | | | | RelNotes 1.8.2: push-simple will not be in effect in this releaseJunio C Hamano2013-02-18
* | | | | shell-prompt: clean up nested if-thenMartin Erik Werner2013-02-18
* | | | | Merge branch 'maint'Junio C Hamano2013-02-18
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | user-manual: use -o latest.tar.gz to create a gzipped tarballW. Trevor King2013-02-18
| * | | | user-manual: use 'git config --global user.*' for setupW. Trevor King2013-02-18
| * | | | user-manual: mention 'git remote add' for remote branch configW. Trevor King2013-02-18
| * | | | user-manual: give 'git push -f' as an alternative to +masterW. Trevor King2013-02-18
| * | | | user-manual: use 'remote add' to setup push URLsW. Trevor King2013-02-18
| |/ / /
* | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-02-18
|\ \ \ \
| * | | | l10n: zh_CN.po: translate 35 new messagesJiang Xin2013-02-18
| * | | | l10n: vi.po: update new strings (2004t0u0f)Tran Ngoc Quan2013-02-17
| * | | | l10n: Update git.pot (35 new, 14 removed messages)Jiang Xin2013-02-14
* | | | | Git 1.8.2-rc0v1.8.2-rc0Junio C Hamano2013-02-17
* | | | | Merge branch 'jc/hidden-refs'Junio C Hamano2013-02-17
|\ \ \ \ \
| * | | | | upload/receive-pack: allow hiding ref hierarchiesJunio C Hamano2013-02-07
| * | | | | upload-pack: simplify request validationJunio C Hamano2013-01-28
| * | | | | upload-pack: share more codeJunio C Hamano2013-01-18
* | | | | | Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-17
|\ \ \ \ \ \
| * | | | | | diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-16
| * | | | | | config: Introduce diff.algorithm variableMichal Privoznik2013-01-16
| * | | | | | git-completion.bash: Autocomplete --minimal and --histogram for git-diffMichal Privoznik2013-01-14
* | | | | | | Merge branch 'mw/bash-prompt-show-untracked-config'Junio C Hamano2013-02-17
|\ \ \ \ \ \ \
| * | | | | | | t9903: add extra tests for bash.showDirtyStateMartin Erik Werner2013-02-13
| * | | | | | | t9903: add tests for bash.showUntrackedFilesMartin Erik Werner2013-02-13
| * | | | | | | shell prompt: add bash.showUntrackedFiles optionMartin Erik Werner2013-02-13
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-17
|\ \ \ \ \ \ \
| * | | | | | | rebase -i: respect core.commentcharJohn Keeping2013-02-12
* | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano2013-02-17
|\ \ \ \ \ \ \ \
| * | | | | | | | log: re-encode commit messages before greppingJeff King2013-02-11
* | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-15
* | | | | | | | | Merge branch 'wk/man-deny-current-branch-is-default-these-days'Junio C Hamano2013-02-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | user-manual: Update for receive.denyCurrentBranch=refuseW. Trevor King2013-02-14
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'mk/make-rm-depdirs-could-be-empty'Junio C Hamano2013-02-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: don't run "rm" without any filesMatt Kraai2013-02-13
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mm/config-local-completion'Junio C Hamano2013-02-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | completion: support 'git config --local'Matthieu Moy2013-02-12
* | | | | | | | | | Merge branch 'ef/non-ascii-parse-options-error-diag'Junio C Hamano2013-02-14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | parse-options: report uncorrupted multi-byte optionsErik Faye-Lund2013-02-11
* | | | | | | | | | | Merge branch 'mk/old-expat'Junio C Hamano2013-02-14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow building with xmlparse.hMatt Kraai2013-02-11
| | |/ / / / / / / / / | |/| | | | | | | | |