summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/reset-p-current-head-fix'Junio C Hamano2013-11-014-16/+23
|\
| * reset: pass real rev name to add--interactivejk/reset-p-current-head-fixJeff King2013-10-253-7/+10
| * add-interactive: handle unborn branch in patch modeJeff King2013-10-251-9/+13
* | Merge branch 'jk/pack-corruption-post-mortem'Junio C Hamano2013-11-012-0/+243
|\ \
| * | howto: add article on recovering a corrupted objectJeff King2013-10-252-0/+243
| |/
* | Merge branch 'jk/for-each-ref-skip-parsing'Junio C Hamano2013-11-012-9/+24
|\ \
| * | for-each-ref: avoid loading objects to print %(objectname)jk/for-each-ref-skip-parsingJeff King2013-10-302-9/+24
* | | Merge branch 'ap/remote-hg-unquote-cquote'Junio C Hamano2013-11-011-0/+6
|\ \ \
| * | | remote-hg: unquote C-style paths when exportingap/remote-hg-unquote-cquoteAntoine Pelisse2013-10-231-0/+6
* | | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-11-012-4/+35
|\ \ \ \
| * | | | mv: Fix spurious warning when moving a file in presence of submodulesjl/submodule-mvJens Lehmann2013-10-132-4/+35
* | | | | Git 1.8.5-rc0v1.8.5-rc0Junio C Hamano2013-10-302-1/+24
* | | | | Merge branch 'maint'Junio C Hamano2013-10-300-0/+0
|\ \ \ \ \
| * | | | | t5570: Update for clone-progress-to-stderr branchBrian Gernhardt2013-10-301-2/+1
* | | | | | Merge branch 'jk/refs-c-squelch-gcc'Junio C Hamano2013-10-301-1/+1
|\ \ \ \ \ \
| * | | | | | silence gcc array-bounds warningjk/refs-c-squelch-gccJeff King2013-10-241-1/+1
* | | | | | | Merge branch 'jk/date-c-double-semicolon'Junio C Hamano2013-10-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | drop redundant semicolon in empty whilejk/date-c-double-semicolonJeff King2013-10-241-1/+1
* | | | | | | | Merge branch 'nd/lift-path-max'Junio C Hamano2013-10-303-6/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout_entry(): clarify the use of topath[] parameternd/lift-path-maxJunio C Hamano2013-10-243-1/+10
| * | | | | | | | entry.c: convert checkout_entry to use strbufNguyễn Thái Ngọc Duy2013-10-241-5/+8
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'tr/valgrind-test-fix'Junio C Hamano2013-10-301-99/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "test-lib: allow prefixing a custom string before "ok N" etc."tr/valgrind-test-fixThomas Rast2013-10-221-15/+12
| * | | | | | | | Revert "test-lib: support running tests under valgrind in parallel"Thomas Rast2013-10-221-84/+22
| |/ / / / / / /
* | | | | | | | Merge branch 'tr/gitk-doc-update'Junio C Hamano2013-10-301-24/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: revamp gitk(1)tr/gitk-doc-updateThomas Rast2013-10-221-24/+83
| |/ / / / / / /
* | | | | | | | Merge branch 'jl/pack-transfer-avoid-double-close'Junio C Hamano2013-10-302-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Clear fd after closing to avoid double-close errorjl/pack-transfer-avoid-double-closeJens Lindstrom2013-10-232-0/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'sb/git-svn-docs-indent-with-ht'Junio C Hamano2013-10-301-13/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | git-svn docs: Use tabs consistently within the ascii docsb/git-svn-docs-indent-with-htStefan Beller2013-10-221-13/+13
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/magic-pathspec'Junio C Hamano2013-10-303-2/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flagsNguyễn Thái Ngọc Duy2013-10-223-2/+19
* | | | | | | | | Merge branch 'nd/gc-lock-against-each-other'Junio C Hamano2013-10-302-0/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gc: remove gc.pid file at end of executionnd/gc-lock-against-each-otherJonathan Nieder2013-10-182-0/+29
* | | | | | | | | | Merge branch 'hn/log-graph-color-octopus'Junio C Hamano2013-10-301-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | graph: fix coloring around octopus mergeshn/log-graph-color-octopusHemmo Nieminen2013-10-181-2/+2
* | | | | | | | | | | Merge branch 'mm/checkout-auto-track-fix'Junio C Hamano2013-10-303-28/+98
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | checkout: proper error message on 'git checkout foo bar --'mm/checkout-auto-track-fixMatthieu Moy2013-10-182-5/+22
| * | | | | | | | | | | checkout: allow dwim for branch creation for "git checkout $branch --"Matthieu Moy2013-10-182-23/+76
* | | | | | | | | | | | Merge branch 'sg/t3600-nul-sha1-fix'Junio C Hamano2013-10-301-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t3600: fix broken "choking git rm" testsg/t3600-nul-sha1-fixSZEDER Gábor2013-10-161-7/+4
* | | | | | | | | | | | | Merge branch 'fc/styles'Junio C Hamano2013-10-3011-18/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | block-sha1/sha1.c: have SP around arithmetic operatorsfc/stylesJunio C Hamano2013-10-161-2/+2
| * | | | | | | | | | | | | base85.c: have SP around arithmetic operatorsJunio C Hamano2013-10-161-1/+1
| * | | | | | | | | | | | | archive.c: have SP around arithmetic operatorsJunio C Hamano2013-10-161-1/+1
| * | | | | | | | | | | | | alloc.c: have SP around arithmetic operatorsJunio C Hamano2013-10-161-1/+1
| * | | | | | | | | | | | | abspath.c: have SP around arithmetic operatorsJunio C Hamano2013-10-161-2/+2
| * | | | | | | | | | | | | alias: have SP around arithmetic operatorsFelipe Contreras2013-10-161-6/+7
| * | | | | | | | | | | | | C: have space around && and || operatorsJunio C Hamano2013-10-165-5/+5
* | | | | | | | | | | | | | Merge branch 'jc/upload-pack-send-symref'Junio C Hamano2013-10-306-22/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \