summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Start preparing for 1.8.4.3Junio C Hamano2013-11-072-1/+37
* Merge branch 'sc/doc-howto-dumb-http' into maintJunio C Hamano2013-11-071-0/+4
|\
| * doc/howto: warn about (dumb)http server document being too oldsc/doc-howto-dumb-httpSitaram Chamarty2013-10-281-0/+4
* | Merge branch 'vd/doc-unpack-objects' into maintJunio C Hamano2013-11-071-1/+1
|\ \
| * | Documentation: "pack-file" is not literal in unpack-objectsvd/doc-unpack-objectsVivien Didelot2013-11-011-1/+1
| * | Documentation: restore a space in unpack-objects usageVivien Didelot2013-10-311-1/+1
* | | Merge branch 'jk/subtree-install-fix' into maintJunio C Hamano2013-11-071-1/+6
|\ \ \
| * | | subtree: add makefile target for html docsjk/subtree-install-fixJeff King2013-10-301-1/+6
* | | | Merge branch 'hn/log-graph-color-octopus' into maintJunio C Hamano2013-11-071-2/+2
|\ \ \ \
| * | | | graph: fix coloring around octopus mergeshn/log-graph-color-octopusHemmo Nieminen2013-10-181-2/+2
* | | | | Merge branch 'mm/checkout-auto-track-fix' into maintJunio C Hamano2013-11-073-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/prompt-svn-remote-fix' into maintJunio C Hamano2013-11-071-1/+1
|\ \ \ \ \ \
| * | | | | | bash prompt: don't use '+=' operator in show upstream code pathsg/prompt-svn-remote-fixSZEDER Gábor2013-10-151-1/+1
* | | | | | | Merge branch 'jk/split-broken-ident' into maintJunio C Hamano2013-11-072-3/+22
|\ \ \ \ \ \ \
| * | | | | | | split_ident: parse timestamp from end of linejk/split-broken-identJeff King2013-10-152-3/+22
| |/ / / / / /
* | | | | | | Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano2013-11-072-22/+45
|\ \ \ \ \ \ \
| * | | | | | | revision: do not peel tags used in range notationJunio C Hamano2013-10-152-22/+45
* | | | | | | | gitignore.txt: fix documentation of "**" patternsKarsten Blees2013-11-071-3/+3
* | | | | | | | t5570: Update for clone-progress-to-stderr branchBrian Gernhardt2013-10-301-2/+1
* | | | | | | | Git 1.8.4.2v1.8.4.2Junio C Hamano2013-10-283-2/+17
* | | | | | | | Merge branch 'jk/clone-progress-to-stderr' into maintJunio C Hamano2013-10-284-28/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: always set transport optionsjk/clone-progress-to-stderrJeff King2013-09-182-16/+18
| * | | | | | | | clone: treat "checking connectivity" like other progressJeff King2013-09-182-3/+4
| * | | | | | | | clone: send diagnostic messages to stderrJeff King2013-09-183-10/+11
* | | | | | | | | Merge branch 'jk/format-patch-from' into maintJunio C Hamano2013-10-284-1/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: print in-body "From" only when neededjk/format-patch-fromJeff King2013-09-204-1/+49
* | | | | | | | | | Merge branch 'jk/shortlog-tolerate-broken-commit' into maintJunio C Hamano2013-10-282-2/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | shortlog: ignore commits with missing authorsjk/shortlog-tolerate-broken-commitJeff King2013-09-182-2/+20
* | | | | | | | | | | Merge branch 'jk/diff-algo' into maintJunio C Hamano2013-10-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: fix parsing of "diff-algorithm" optionjk/diff-algoJohn Keeping2013-09-261-2/+2
* | | | | | | | | | | | test-lib: fix typo in commentTorstein Hegge2013-10-281-1/+1
* | | | | | | | | | | | sha1_file: move comment about return value where it belongsChristian Couder2013-10-281-1/+1
* | | | | | | | | | | | Almost 1.8.4.2 ;-)Junio C Hamano2013-10-231-0/+13
* | | | | | | | | | | | Merge branch 'jc/ls-files-killed-optim' into maintJunio C Hamano2013-10-234-17/+67
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | dir.c::test_one_path(): work around directory_exists_in_index_icase() breakagejc/ls-files-killed-optimEric Sunshine2013-08-232-9/+24
| * | | | | | | | | | | | t3010: update to demonstrate "ls-files -k" optimization pitfallsJunio C Hamano2013-08-151-3/+9
| * | | | | | | | | | | | ls-files -k: a directory only can be killed if the index has a non-directoryJunio C Hamano2013-08-153-3/+31
| * | | | | | | | | | | | dir.c: use the cache_* macro to access the current indexJunio C Hamano2013-08-151-6/+5
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-10-234-8/+45
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t3200: fix failure on case-insensitive filesystemsjh/checkout-auto-trackingEric Sunshine2013-09-171-0/+1
| * | | | | | | | | | | | branch.c: Relax unnecessary requirement on upstream's remote ref namePer Cederqvist2013-09-092-3/+2
| * | | | | | | | | | | | t3200: Add test demonstrating minor regression in 41c21f2Johan Herland2013-09-091-0/+34
| * | | | | | | | | | | | Refer to branch.<name>.remote/merge when documenting --trackJohan Herland2013-09-091-2/+4
| * | | | | | | | | | | | t3200: Minor fix when preparing for tracking failureJohan Herland2013-09-091-1/+2
| * | | | | | | | | | | | t2024: Fix &&-chaining and a couple of typosJohan Herland2013-09-091-3/+3
* | | | | | | | | | | | | Merge branch 'nd/fetch-into-shallow' into maintJunio C Hamano2013-10-2312-160/+152
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add testcase for needless objects during a shallow fetchnd/fetch-into-shallowMatthijs Kooijman2013-08-281-0/+11
| * | | | | | | | | | | | | list-objects: mark more commits as edges in mark_edges_uninterestingNguyễn Thái Ngọc Duy2013-08-281-0/+17