summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-curl.c: Fix a compiler warningRamsay Jones2012-11-211-1/+1
* | | | | | | | | Sixth batch for 1.8.1Junio C Hamano2012-11-201-3/+39
* | | | | | | | | Merge branch 'ml/cygwin-mingw-headers'Junio C Hamano2012-11-202-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | USE CGYWIN_V15_WIN32API as macro to select api for cygwinMark Levedahl2012-11-182-4/+4
| * | | | | | | | | Update cygwin.c for new mingw-64 win32 api headersMark Levedahl2012-11-122-0/+11
* | | | | | | | | | Merge branch 'jk/checkout-out-of-unborn'Junio C Hamano2012-11-201-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | checkout: print a message when switching unborn branchesJeff King2012-11-151-0/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'cn/config-missing-path'Junio C Hamano2012-11-202-1/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | config: don't segfault when given --path with a missing valueCarlos Martín Nieto2012-11-152-1/+7
* | | | | | | | | Merge branch 'jl/submodule-rm'Junio C Hamano2012-11-201-15/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs: move submodule sectionMatt Kraai2012-11-141-15/+15
* | | | | | | | | | Merge branch 'mg/replace-resolve-delete'Junio C Hamano2012-11-202-6/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | replace: parse revision argument for -dMichael J Gruber2012-11-132-6/+20
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/maint-gitweb-xss'Junio C Hamano2012-11-202-0/+16
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | gitweb: escape html in rss titleJeff King2012-11-122-0/+16
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'rh/maint-gitweb-highlight-ext'Junio C Hamano2012-11-201-9/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb.perl: fix %highlight_ext mappingsRichard Hubbell2012-11-081-9/+8
| |/ / / / / / / /
* | | | | | | | | Merge branch 'pw/maint-p4-rcs-expansion-newline'Junio C Hamano2012-11-202-1/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git p4: RCS expansion should not span newlinesPete Wyckoff2012-11-082-1/+20
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mh/alt-odb-string-list-cleanup'Junio C Hamano2012-11-201-28/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | link_alt_odb_entries(): take (char *, len) rather than two pointersMichael Haggerty2012-11-081-5/+5