Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/reset-p-current-head-fix' | Junio C Hamano | 2013-11-01 | 4 | -16/+23 |
|\ | |||||
| * | reset: pass real rev name to add--interactivejk/reset-p-current-head-fix | Jeff King | 2013-10-25 | 3 | -7/+10 |
| * | add-interactive: handle unborn branch in patch mode | Jeff King | 2013-10-25 | 1 | -9/+13 |
* | | Merge branch 'jk/pack-corruption-post-mortem' | Junio C Hamano | 2013-11-01 | 2 | -0/+243 |
|\ \ | |||||
| * | | howto: add article on recovering a corrupted object | Jeff King | 2013-10-25 | 2 | -0/+243 |
| |/ | |||||
* | | Merge branch 'jk/for-each-ref-skip-parsing' | Junio C Hamano | 2013-11-01 | 2 | -9/+24 |
|\ \ | |||||
| * | | for-each-ref: avoid loading objects to print %(objectname)jk/for-each-ref-skip-parsing | Jeff King | 2013-10-30 | 2 | -9/+24 |
* | | | Merge branch 'ap/remote-hg-unquote-cquote' | Junio C Hamano | 2013-11-01 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | remote-hg: unquote C-style paths when exportingap/remote-hg-unquote-cquote | Antoine Pelisse | 2013-10-23 | 1 | -0/+6 |
* | | | | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-11-01 | 2 | -4/+35 |
|\ \ \ \ | |||||
| * | | | | mv: Fix spurious warning when moving a file in presence of submodulesjl/submodule-mv | Jens Lehmann | 2013-10-13 | 2 | -4/+35 |
* | | | | | Git 1.8.5-rc0v1.8.5-rc0 | Junio C Hamano | 2013-10-30 | 2 | -1/+24 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2013-10-30 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * | | | | | t5570: Update for clone-progress-to-stderr branch | Brian Gernhardt | 2013-10-30 | 1 | -2/+1 |
* | | | | | | Merge branch 'jk/refs-c-squelch-gcc' | Junio C Hamano | 2013-10-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | silence gcc array-bounds warningjk/refs-c-squelch-gcc | Jeff King | 2013-10-24 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/date-c-double-semicolon' | Junio C Hamano | 2013-10-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | drop redundant semicolon in empty whilejk/date-c-double-semicolon | Jeff King | 2013-10-24 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'nd/lift-path-max' | Junio C Hamano | 2013-10-30 | 3 | -6/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout_entry(): clarify the use of topath[] parameternd/lift-path-max | Junio C Hamano | 2013-10-24 | 3 | -1/+10 |
| * | | | | | | | | entry.c: convert checkout_entry to use strbuf | Nguyễn Thái Ngọc Duy | 2013-10-24 | 1 | -5/+8 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'tr/valgrind-test-fix' | Junio C Hamano | 2013-10-30 | 1 | -99/+34 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert "test-lib: allow prefixing a custom string before "ok N" etc."tr/valgrind-test-fix | Thomas Rast | 2013-10-22 | 1 | -15/+12 |
| * | | | | | | | | Revert "test-lib: support running tests under valgrind in parallel" | Thomas Rast | 2013-10-22 | 1 | -84/+22 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'tr/gitk-doc-update' | Junio C Hamano | 2013-10-30 | 1 | -24/+83 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: revamp gitk(1)tr/gitk-doc-update | Thomas Rast | 2013-10-22 | 1 | -24/+83 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jl/pack-transfer-avoid-double-close' | Junio C Hamano | 2013-10-30 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Clear fd after closing to avoid double-close errorjl/pack-transfer-avoid-double-close | Jens Lindstrom | 2013-10-23 | 2 | -0/+8 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'sb/git-svn-docs-indent-with-ht' | Junio C Hamano | 2013-10-30 | 1 | -13/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-svn docs: Use tabs consistently within the ascii docsb/git-svn-docs-indent-with-ht | Stefan Beller | 2013-10-22 | 1 | -13/+13 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'nd/magic-pathspec' | Junio C Hamano | 2013-10-30 | 3 | -2/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags | Nguyễn Thái Ngọc Duy | 2013-10-22 | 3 | -2/+19 |
* | | | | | | | | | Merge branch 'nd/gc-lock-against-each-other' | Junio C Hamano | 2013-10-30 | 2 | -0/+29 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gc: remove gc.pid file at end of executionnd/gc-lock-against-each-other | Jonathan Nieder | 2013-10-18 | 2 | -0/+29 |
* | | | | | | | | | | Merge branch 'hn/log-graph-color-octopus' | Junio C Hamano | 2013-10-30 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | graph: fix coloring around octopus mergeshn/log-graph-color-octopus | Hemmo Nieminen | 2013-10-18 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'mm/checkout-auto-track-fix' | Junio C Hamano | 2013-10-30 | 3 | -28/+98 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | checkout: proper error message on 'git checkout foo bar --'mm/checkout-auto-track-fix | Matthieu Moy | 2013-10-18 | 2 | -5/+22 |
| * | | | | | | | | | | | checkout: allow dwim for branch creation for "git checkout $branch --" | Matthieu Moy | 2013-10-18 | 2 | -23/+76 |
* | | | | | | | | | | | | Merge branch 'sg/t3600-nul-sha1-fix' | Junio C Hamano | 2013-10-30 | 1 | -7/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t3600: fix broken "choking git rm" testsg/t3600-nul-sha1-fix | SZEDER Gábor | 2013-10-16 | 1 | -7/+4 |
* | | | | | | | | | | | | | Merge branch 'fc/styles' | Junio C Hamano | 2013-10-30 | 11 | -18/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | block-sha1/sha1.c: have SP around arithmetic operatorsfc/styles | Junio C Hamano | 2013-10-16 | 1 | -2/+2 |
| * | | | | | | | | | | | | | base85.c: have SP around arithmetic operators | Junio C Hamano | 2013-10-16 | 1 | -1/+1 |
| * | | | | | | | | | | | | | archive.c: have SP around arithmetic operators | Junio C Hamano | 2013-10-16 | 1 | -1/+1 |
| * | | | | | | | | | | | | | alloc.c: have SP around arithmetic operators | Junio C Hamano | 2013-10-16 | 1 | -1/+1 |
| * | | | | | | | | | | | | | abspath.c: have SP around arithmetic operators | Junio C Hamano | 2013-10-16 | 1 | -2/+2 |
| * | | | | | | | | | | | | | alias: have SP around arithmetic operators | Felipe Contreras | 2013-10-16 | 1 | -6/+7 |
| * | | | | | | | | | | | | | C: have space around && and || operators | Junio C Hamano | 2013-10-16 | 5 | -5/+5 |
* | | | | | | | | | | | | | | Merge branch 'jc/upload-pack-send-symref' | Junio C Hamano | 2013-10-30 | 6 | -22/+125 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |