summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2012-11-262-2/+2
|\
| * Fix typo in remote set-head usageAntoine Pelisse2012-11-261-1/+1
| * Makefile: hide stderr of curl-config testPaul Gortmaker2012-11-261-1/+1
* | emacs: make 'git-status' work with separate git dirsEnrico Scholz2012-11-261-1/+1
* | Update draft release notes to 1.8.1Junio C Hamano2012-11-251-0/+14
* | Merge branch 'rr/submodule-diff-config'Junio C Hamano2012-11-257-24/+98
|\ \
| * | submodule: display summary header in boldRamkumar Ramachandra2012-11-183-6/+6
| * | diff: rename "set" variableJeff King2012-11-182-6/+21
| * | diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-184-6/+65
| * | Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-11-182-6/+6
* | | Merge branch 'nd/maint-compat-fnmatch-fix'Junio C Hamano2012-11-251-1/+1
|\ \ \
| * | | compat/fnmatch: fix off-by-one character class's length checkNguyễn Thái Ngọc Duy2012-11-201-1/+1
* | | | Merge branch 'bc/do-not-recurse-in-die'Junio C Hamano2012-11-251-0/+15
|\ \ \ \
| * | | | usage.c: detect recursion in die routines and bail out immediatelyBrandon Casey2012-11-151-0/+15
| |/ / /
* | | | Merge branch 'mk/complete-tcsh'Junio C Hamano2012-11-251-0/+63
|\ \ \ \
| * | | | tcsh-completion re-using git-completion.bashMarc Khouzam2012-11-161-0/+63
* | | | | Merge branch 'jh/update-ref-d-through-symref'Junio C Hamano2012-11-252-1/+19
|\ \ \ \ \
| * | | | | Fix failure to delete a packed ref through a symrefJohan Herland2012-10-212-2/+2
| * | | | | t1400-update-ref: Add test verifying bug with symrefs in delete_ref()Johan Herland2012-10-211-0/+18
* | | | | | Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2012-11-254-36/+42
|\ \ \ \ \ \
| * | | | | | Fix "git diff --stat" for interesting - but empty - file changesLinus Torvalds2012-10-174-36/+42
* | | | | | | Merge branch 'sg/complete-help-undup'Junio C Hamano2012-11-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | completion: remove 'help' duplicate from porcelain commandsSZEDER Gábor2012-11-141-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Sync with 1.8.0.1Junio C Hamano2012-11-254-4/+17
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Git 1.8.0.1v1.8.0.1Junio C Hamano2012-11-253-3/+16
| * | | | | | Merge branch 'jk/checkout-out-of-unborn' into maintJunio C Hamano2012-11-251-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cn/config-missing-path' into maintJunio C Hamano2012-11-252-1/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-gitweb-xss' into maintJunio C Hamano2012-11-252-0/+16
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Completion must sort before using uniqMarc Khouzam2012-11-241-1/+1
* | | | | | | | | | Update draft release notes for 1.8.1Junio C Hamano2012-11-211-0/+10
* | | | | | | | | | Merge branch 'esr/maint-doc-fast-import'Junio C Hamano2012-11-211-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc/fast-import: clarify how content states are builtEric S. Raymond2012-11-081-2/+6
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'wtk/submodule-doc-fixup'Junio C Hamano2012-11-212-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-submodule: wrap branch option with "<>" in usage strings.W. Trevor King2012-10-252-2/+2
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'so/prompt-command'Junio C Hamano2012-11-211-8/+90
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | coloured git-prompt: paint detached HEAD marker in redJunio C Hamano2012-10-171-1/+1
| * | | | | | | | | | Fix up colored git-promptSimon Oosthoek2012-10-161-23/+32
| * | | | | | | | | | show color hints based on state of the git treeSimon Oosthoek2012-10-111-1/+35
| * | | | | | | | | | Allow __git_ps1 to be used in PROMPT_COMMANDSimon Oosthoek2012-10-111-6/+45
* | | | | | | | | | | Merge branch 'jk/config-ignore-duplicates'Junio C Hamano2012-11-214-196/+232
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/config.c: Fix a sparse warningRamsay Jones2012-10-291-1/+1
| * | | | | | | | | | | git-config: use git_config_with_optionsJeff King2012-10-241-42/+2
| * | | | | | | | | | | git-config: do not complain about duplicate entriesJeff King2012-10-243-22/+14
| * | | | | | | | | | | git-config: collect values instead of immediately printingJeff King2012-10-241-15/+35
| * | | | | | | | | | | git-config: fix regexp memory leaks on error conditionsJeff King2012-10-242-10/+14
| * | | | | | | | | | | git-config: remove memory leak of key regexpJeff King2012-10-241-0/+4
| * | | | | | | | | | | t1300: test "git config --get-all" more thoroughlyJeff King2012-10-241-2/+7
| * | | | | | | | | | | t1300: remove redundant testJeff King2012-10-241-4/+0
| * | | | | | | | | | | t1300: style updatesJeff King2012-10-241-123/+178
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/maint-http-half-auth-fetch'Junio C Hamano2012-11-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \