summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* for-each-ref: avoid color leakagerr/for-each-ref-decorationRamkumar Ramachandra2013-11-192-6/+24
* for-each-ref: introduce %(color:...) for colorRamkumar Ramachandra2013-11-193-2/+30
* for-each-ref: introduce %(upstream:track[short])Ramkumar Ramachandra2013-11-193-4/+69
* for-each-ref: introduce %(HEAD) asterisk markerRamkumar Ramachandra2013-11-183-2/+17
* t6300 (for-each-ref): don't hardcode SHA-1 hexesRamkumar Ramachandra2013-11-181-8/+8
* t6300 (for-each-ref): clearly demarcate setupRamkumar Ramachandra2013-11-181-5/+2
* 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5570: Update for clone-progress-to-stderr branchjc/upload-pack-send-symrefBrian Gernhardt2013-10-221-2/+1
| * | | | | | | | | | | Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symrefJunio C Hamano2013-10-224-28/+32
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5570: Update for symref capabilityBrian Gernhardt2013-10-221-1/+1
| * | | | | | | | | | | | clone: test the new HEAD detection logicJunio C Hamano2013-09-171-0/+11
| * | | | | | | | | | | | connect: annotate refs with their symref information in get_remote_head()Junio C Hamano2013-09-172-11/+64