Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sg/complete-help-undup' | Junio C Hamano | 2012-11-25 | 1 | -1/+1 |
|\ | |||||
| * | completion: remove 'help' duplicate from porcelain commands | SZEDER Gábor | 2012-11-14 | 1 | -1/+1 |
* | | Sync with 1.8.0.1 | Junio C Hamano | 2012-11-25 | 4 | -4/+17 |
|\ \ | |||||
| * | | Git 1.8.0.1v1.8.0.1 | Junio C Hamano | 2012-11-25 | 3 | -3/+16 |
| * | | Merge branch 'jk/checkout-out-of-unborn' into maint | Junio C Hamano | 2012-11-25 | 1 | -0/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'cn/config-missing-path' into maint | Junio C Hamano | 2012-11-25 | 2 | -1/+7 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/maint-gitweb-xss' into maint | Junio C Hamano | 2012-11-25 | 2 | -0/+16 |
| |\ \ \ \ | |||||
| * | | | | | Completion must sort before using uniq | Marc Khouzam | 2012-11-24 | 1 | -1/+1 |
* | | | | | | Update draft release notes for 1.8.1 | Junio C Hamano | 2012-11-21 | 1 | -0/+10 |
* | | | | | | Merge branch 'esr/maint-doc-fast-import' | Junio C Hamano | 2012-11-21 | 1 | -2/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | doc/fast-import: clarify how content states are built | Eric S. Raymond | 2012-11-08 | 1 | -2/+6 |
* | | | | | | | Merge branch 'wtk/submodule-doc-fixup' | Junio C Hamano | 2012-11-21 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-submodule: wrap branch option with "<>" in usage strings. | W. Trevor King | 2012-10-25 | 2 | -2/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'so/prompt-command' | Junio C Hamano | 2012-11-21 | 1 | -8/+90 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | coloured git-prompt: paint detached HEAD marker in red | Junio C Hamano | 2012-10-17 | 1 | -1/+1 |
| * | | | | | | | Fix up colored git-prompt | Simon Oosthoek | 2012-10-16 | 1 | -23/+32 |
| * | | | | | | | show color hints based on state of the git tree | Simon Oosthoek | 2012-10-11 | 1 | -1/+35 |
| * | | | | | | | Allow __git_ps1 to be used in PROMPT_COMMAND | Simon Oosthoek | 2012-10-11 | 1 | -6/+45 |
* | | | | | | | | Merge branch 'jk/config-ignore-duplicates' | Junio C Hamano | 2012-11-21 | 4 | -196/+232 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | builtin/config.c: Fix a sparse warning | Ramsay Jones | 2012-10-29 | 1 | -1/+1 |
| * | | | | | | | | git-config: use git_config_with_options | Jeff King | 2012-10-24 | 1 | -42/+2 |
| * | | | | | | | | git-config: do not complain about duplicate entries | Jeff King | 2012-10-24 | 3 | -22/+14 |
| * | | | | | | | | git-config: collect values instead of immediately printing | Jeff King | 2012-10-24 | 1 | -15/+35 |
| * | | | | | | | | git-config: fix regexp memory leaks on error conditions | Jeff King | 2012-10-24 | 2 | -10/+14 |
| * | | | | | | | | git-config: remove memory leak of key regexp | Jeff King | 2012-10-24 | 1 | -0/+4 |
| * | | | | | | | | t1300: test "git config --get-all" more thoroughly | Jeff King | 2012-10-24 | 1 | -2/+7 |
| * | | | | | | | | t1300: remove redundant test | Jeff King | 2012-10-24 | 1 | -4/+0 |
| * | | | | | | | | t1300: style updates | Jeff King | 2012-10-24 | 1 | -123/+178 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/maint-http-half-auth-fetch' | Junio C Hamano | 2012-11-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remote-curl.c: Fix a compiler warning | Ramsay Jones | 2012-11-21 | 1 | -1/+1 |
* | | | | | | | | | Sixth batch for 1.8.1 | Junio C Hamano | 2012-11-20 | 1 | -3/+39 |
* | | | | | | | | | Merge branch 'ml/cygwin-mingw-headers' | Junio C Hamano | 2012-11-20 | 2 | -0/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | USE CGYWIN_V15_WIN32API as macro to select api for cygwin | Mark Levedahl | 2012-11-18 | 2 | -4/+4 |
| * | | | | | | | | | Update cygwin.c for new mingw-64 win32 api headers | Mark Levedahl | 2012-11-12 | 2 | -0/+11 |
* | | | | | | | | | | Merge branch 'jk/checkout-out-of-unborn' | Junio C Hamano | 2012-11-20 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | checkout: print a message when switching unborn branches | Jeff King | 2012-11-15 | 1 | -0/+3 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'cn/config-missing-path' | Junio C Hamano | 2012-11-20 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | config: don't segfault when given --path with a missing value | Carlos Martín Nieto | 2012-11-15 | 2 | -1/+7 |
* | | | | | | | | | Merge branch 'jl/submodule-rm' | Junio C Hamano | 2012-11-20 | 1 | -15/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | docs: move submodule section | Matt Kraai | 2012-11-14 | 1 | -15/+15 |
* | | | | | | | | | | Merge branch 'mg/replace-resolve-delete' | Junio C Hamano | 2012-11-20 | 2 | -6/+20 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | replace: parse revision argument for -d | Michael J Gruber | 2012-11-13 | 2 | -6/+20 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/maint-gitweb-xss' | Junio C Hamano | 2012-11-20 | 2 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | gitweb: escape html in rss title | Jeff King | 2012-11-12 | 2 | -0/+16 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rh/maint-gitweb-highlight-ext' | Junio C Hamano | 2012-11-20 | 1 | -9/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gitweb.perl: fix %highlight_ext mappings | Richard Hubbell | 2012-11-08 | 1 | -9/+8 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'pw/maint-p4-rcs-expansion-newline' | Junio C Hamano | 2012-11-20 | 2 | -1/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git p4: RCS expansion should not span newlines | Pete Wyckoff | 2012-11-08 | 2 | -1/+20 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'mh/alt-odb-string-list-cleanup' | Junio C Hamano | 2012-11-20 | 1 | -28/+22 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | link_alt_odb_entries(): take (char *, len) rather than two pointers | Michael Haggerty | 2012-11-08 | 1 | -5/+5 |