summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | | user-manual: Use request-pull to generate "please pull" textW. Trevor King2013-02-191-9/+5
| * | | | | | | | | | | | | | | | | | | | | | user-manual: Reorganize the reroll sections, adding 'git rebase -i'W. Trevor King2013-02-191-46/+69
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/less-reconfigure'Junio C Hamano2013-02-251-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Makefile: avoid infinite loop on configure.ac changeJeff King2013-02-201-6/+8
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/check-ignore'Junio C Hamano2013-02-253-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | name-hash: allow hashing an empty stringJunio C Hamano2013-02-193-3/+8
| * | | | | | | | | | | | | | | | | | | | | | | t0008: document test_expect_success_multiAdam Spiers2013-02-191-0/+10
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ct/autoconf-htmldir'Junio C Hamano2013-02-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Bugfix: undefined htmldir in config.mak.autogenJiang Xin2013-02-191-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'wk/man-deny-current-branch-is-default-these-days'Junio C Hamano2013-02-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | user-manual: typofix (ofthe->of the)Junio C Hamano2013-02-181-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Sync with v1.8.1.4Junio C Hamano2013-02-193-3/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Git 1.8.1.4v1.8.1.4Junio C Hamano2013-02-194-3/+15
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ob/imap-send-ssl-verify' into maintJunio C Hamano2013-02-191-2/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | imap-send: support subjectAltName as wellOswald Buddenhagen2013-02-191-0/+19
| | * | | | | | | | | | | | | | | | | | | | | | imap-send: the subject of SSL certificate must match the hostOswald Buddenhagen2013-02-191-0/+39
| | * | | | | | | | | | | | | | | | | | | | | | imap-send: move #ifdef aroundJunio C Hamano2013-02-181-2/+7
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/mention-tracking-for-pull-default'Junio C Hamano2013-02-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | doc: mention tracking for pull.defaultJunio C Hamano2013-01-311-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/config-intro-in-git-doc'Junio C Hamano2013-02-181-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | git.txt: update description of the configuration mechanismMatthieu Moy2013-02-151-6/+5
* | | | | | | | | | | | | | | | | | | | | | | | RelNotes 1.8.2: push-simple will not be in effect in this releaseJunio C Hamano2013-02-181-2/+14
* | | | | | | | | | | | | | | | | | | | | | | | shell-prompt: clean up nested if-thenMartin Erik Werner2013-02-181-14/+13
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-02-181-40/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | user-manual: use -o latest.tar.gz to create a gzipped tarballW. Trevor King2013-02-181-3/+12
| * | | | | | | | | | | | | | | | | | | | | | | user-manual: use 'git config --global user.*' for setupW. Trevor King2013-02-181-5/+13
| * | | | | | | | | | | | | | | | | | | | | | | user-manual: mention 'git remote add' for remote branch configW. Trevor King2013-02-181-27/+13
| * | | | | | | | | | | | | | | | | | | | | | | user-manual: give 'git push -f' as an alternative to +masterW. Trevor King2013-02-181-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | user-manual: use 'remote add' to setup push URLsW. Trevor King2013-02-181-5/+10
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-02-183-1873/+2284
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | l10n: zh_CN.po: translate 35 new messagesJiang Xin2013-02-181-625/+767
| * | | | | | | | | | | | | | | | | | | | | | | l10n: vi.po: update new strings (2004t0u0f)Tran Ngoc Quan2013-02-171-647/+795
| * | | | | | | | | | | | | | | | | | | | | | | l10n: Update git.pot (35 new, 14 removed messages)Jiang Xin2013-02-141-601/+722
* | | | | | | | | | | | | | | | | | | | | | | | Git 1.8.2-rc0v1.8.2-rc0Junio C Hamano2013-02-172-1/+14
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/hidden-refs'Junio C Hamano2013-02-177-30/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | upload/receive-pack: allow hiding ref hierarchiesJunio C Hamano2013-02-077-1/+146
| * | | | | | | | | | | | | | | | | | | | | | | | upload-pack: simplify request validationJunio C Hamano2013-01-281-17/+11
| * | | | | | | | | | | | | | | | | | | | | | | | upload-pack: share more codeJunio C Hamano2013-01-181-17/+14
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-176-1/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-165-1/+53
| * | | | | | | | | | | | | | | | | | | | | | | | | config: Introduce diff.algorithm variableMichal Privoznik2013-01-163-0/+42
| * | | | | | | | | | | | | | | | | | | | | | | | | git-completion.bash: Autocomplete --minimal and --histogram for git-diffMichal Privoznik2013-01-141-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mw/bash-prompt-show-untracked-config'Junio C Hamano2013-02-172-4/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | t9903: add extra tests for bash.showDirtyStateMartin Erik Werner2013-02-131-1/+37
| * | | | | | | | | | | | | | | | | | | | | | | | | | t9903: add tests for bash.showUntrackedFilesMartin Erik Werner2013-02-131-0/+40
| * | | | | | | | | | | | | | | | | | | | | | | | | | shell prompt: add bash.showUntrackedFiles optionMartin Erik Werner2013-02-131-3/+8
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-172-40/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | rebase -i: respect core.commentcharJohn Keeping2013-02-122-40/+58