summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'yd/use-test-config-unconfig'Junio C Hamano2013-03-2811-142/+75
|\
| * t5520: use test_config to set/unset git config variables (leftover bits)Ramkumar Ramachandra2013-03-281-3/+3
| * t7600: use test_config to set/unset git config variablesYann Droneaud2013-03-251-34/+26
| * t7502: remove clear_configYann Droneaud2013-03-251-26/+6
| * t7502: use test_config to set/unset git config variablesYann Droneaud2013-03-251-5/+3
| * t9500: use test_config to set/unset git config variablesYann Droneaud2013-03-251-2/+1
| * t7508: use test_config to set/unset git config variablesYann Droneaud2013-03-251-30/+16
| * t7500: use test_config to set/unset git config variablesYann Droneaud2013-03-251-4/+2
| * t5541: use test_config to set/unset git config variablesYann Droneaud2013-03-251-2/+1
| * t5520: use test_config to set/unset git config variablesYann Droneaud2013-03-251-8/+4
| * t4202: use test_config/test_unconfig to set/unset git config variablesYann Droneaud2013-03-251-20/+8
| * t4034: use test_config/test_unconfig to set/unset git config variablesYann Droneaud2013-03-251-4/+3
| * t4304: use test_config to set/unset git config variablesYann Droneaud2013-03-251-2/+1
| * t3400: use test_config to set/unset git config variablesYann Droneaud2013-03-251-2/+1
* | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second'Junio C Hamano2013-03-282-1/+14
|\ \
| * | Fix revision walk for commits with the same datesKacper Kornet2013-03-222-1/+14
* | | Merge branch 'rr/tests-dedup-test-config'Junio C Hamano2013-03-282-10/+0
|\ \ \
| * | | t4018,7810,7811: remove test_config() redefinitionRamkumar Ramachandra2013-03-193-15/+0
* | | | Merge branch 'yd/doc-is-in-asciidoc'Junio C Hamano2013-03-281-0/+3
|\ \ \ \
| * | | | CodingGuidelines: our documents are in AsciiDocJunio C Hamano2013-03-211-0/+3
| | |_|/ | |/| |
* | | | Merge branch 'yd/doc-merge-annotated-tag'Junio C Hamano2013-03-282-1/+26
|\ \ \ \
| * | | | Documentation: merging a tag is a special caseJunio C Hamano2013-03-212-1/+26
* | | | | Merge branch 'jc/remove-treesame-parent-in-simplify-merges'Junio C Hamano2013-03-282-8/+48
|\ \ \ \ \
| * | | | | simplify-merges: drop merge from irrelevant side branchJunio C Hamano2013-01-172-5/+44
* | | | | | Merge branch 'jk/checkout-attribute-lookup'Junio C Hamano2013-03-282-74/+97
|\ \ \ \ \ \
| * | | | | | t2003: work around path mangling issue on WindowsJohannes Sixt2013-03-201-2/+2
| * | | | | | entry: fix filter lookupJohn Keeping2013-03-142-1/+27
| * | | | | | t2003: modernize styleJohn Keeping2013-03-141-73/+70
* | | | | | | Merge branch 'jk/difftool-dir-diff-edit-fix'Junio C Hamano2013-03-283-7/+48
|\ \ \ \ \ \ \
| * | | | | | | difftool --dir-diff: symlink all files matching the working treeJohn Keeping2013-03-143-4/+43
| * | | | | | | difftool: avoid double slashes in symlink targetsJohn Keeping2013-03-141-1/+3
| * | | | | | | git-difftool(1): fix formatting of --symlink descriptionJohn Keeping2013-03-141-2/+2
* | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-281-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-281-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | git help config: s/insn/instruction/Matthias Krüger2013-03-281-1/+1
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-274-2/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | More fixes for 1.8.2.1Junio C Hamano2013-03-271-0/+3
| * | | | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-273-2/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
| | * | | | | | | | git-commit doc: describe use of multiple `-m` optionsChristian Helmuth2013-03-271-0/+2
| | * | | | | | | | git-pull doc: fix grammo ("conflicts" is plural)Mihai Capotă2013-03-271-1/+1
* | | | | | | | | | Merge branch 'master' of git://git.bogomips.org/git-svnJunio C Hamano2013-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-svn: Support custom tunnel schemes instead of SSH onlySebastian Schuberth2013-03-271-1/+1
* | | | | | | | | | | Merge branch 'rs/archive-zip-raw-compression'Junio C Hamano2013-03-273-28/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | archive-zip: use deflateInit2() to ask for raw compressed dataRené Scharfe2013-03-163-28/+34
* | | | | | | | | | | | Merge branch 'ap/combine-diff-ignore-whitespace'Junio C Hamano2013-03-272-7/+161
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Allow combined diff to ignore white-spacesAntoine Pelisse2013-03-142-7/+161
* | | | | | | | | | | | More topics from the second batch for 1.8.3Junio C Hamano2013-03-261-14/+8
* | | | | | | | | | | | Merge branch 'jc/reflog-reverse-walk'Junio C Hamano2013-03-263-77/+134
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | refs.c: fix fread error handlingJohn Keeping2013-03-231-1/+1