Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'yd/use-test-config-unconfig' | Junio C Hamano | 2013-03-28 | 11 | -142/+75 |
|\ | |||||
| * | t5520: use test_config to set/unset git config variables (leftover bits) | Ramkumar Ramachandra | 2013-03-28 | 1 | -3/+3 |
| * | t7600: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -34/+26 |
| * | t7502: remove clear_config | Yann Droneaud | 2013-03-25 | 1 | -26/+6 |
| * | t7502: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -5/+3 |
| * | t9500: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -2/+1 |
| * | t7508: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -30/+16 |
| * | t7500: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -4/+2 |
| * | t5541: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -2/+1 |
| * | t5520: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -8/+4 |
| * | t4202: use test_config/test_unconfig to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -20/+8 |
| * | t4034: use test_config/test_unconfig to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -4/+3 |
| * | t4304: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -2/+1 |
| * | t3400: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -2/+1 |
* | | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' | Junio C Hamano | 2013-03-28 | 2 | -1/+14 |
|\ \ | |||||
| * | | Fix revision walk for commits with the same dates | Kacper Kornet | 2013-03-22 | 2 | -1/+14 |
* | | | Merge branch 'rr/tests-dedup-test-config' | Junio C Hamano | 2013-03-28 | 2 | -10/+0 |
|\ \ \ | |||||
| * | | | t4018,7810,7811: remove test_config() redefinition | Ramkumar Ramachandra | 2013-03-19 | 3 | -15/+0 |
* | | | | Merge branch 'yd/doc-is-in-asciidoc' | Junio C Hamano | 2013-03-28 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | CodingGuidelines: our documents are in AsciiDoc | Junio C Hamano | 2013-03-21 | 1 | -0/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'yd/doc-merge-annotated-tag' | Junio C Hamano | 2013-03-28 | 2 | -1/+26 |
|\ \ \ \ | |||||
| * | | | | Documentation: merging a tag is a special case | Junio C Hamano | 2013-03-21 | 2 | -1/+26 |
* | | | | | Merge branch 'jc/remove-treesame-parent-in-simplify-merges' | Junio C Hamano | 2013-03-28 | 2 | -8/+48 |
|\ \ \ \ \ | |||||
| * | | | | | simplify-merges: drop merge from irrelevant side branch | Junio C Hamano | 2013-01-17 | 2 | -5/+44 |
* | | | | | | Merge branch 'jk/checkout-attribute-lookup' | Junio C Hamano | 2013-03-28 | 2 | -74/+97 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t2003: work around path mangling issue on Windows | Johannes Sixt | 2013-03-20 | 1 | -2/+2 |
| * | | | | | | entry: fix filter lookup | John Keeping | 2013-03-14 | 2 | -1/+27 |
| * | | | | | | t2003: modernize style | John Keeping | 2013-03-14 | 1 | -73/+70 |
* | | | | | | | Merge branch 'jk/difftool-dir-diff-edit-fix' | Junio C Hamano | 2013-03-28 | 3 | -7/+48 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | difftool --dir-diff: symlink all files matching the working tree | John Keeping | 2013-03-14 | 3 | -4/+43 |
| * | | | | | | | difftool: avoid double slashes in symlink targets | John Keeping | 2013-03-14 | 1 | -1/+3 |
| * | | | | | | | git-difftool(1): fix formatting of --symlink description | John Keeping | 2013-03-14 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | git help config: s/insn/instruction/ | Matthias Krüger | 2013-03-28 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-27 | 4 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | More fixes for 1.8.2.1 | Junio C Hamano | 2013-03-27 | 1 | -0/+3 |
| * | | | | | | | | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-27 | 3 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | merge-tree: fix typo in merge-tree.c::unresolved | John Keeping | 2013-03-27 | 1 | -1/+1 |
| | * | | | | | | | | git-commit doc: describe use of multiple `-m` options | Christian Helmuth | 2013-03-27 | 1 | -0/+2 |
| | * | | | | | | | | git-pull doc: fix grammo ("conflicts" is plural) | Mihai Capotă | 2013-03-27 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'master' of git://git.bogomips.org/git-svn | Junio C Hamano | 2013-03-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-svn: Support custom tunnel schemes instead of SSH only | Sebastian Schuberth | 2013-03-27 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'rs/archive-zip-raw-compression' | Junio C Hamano | 2013-03-27 | 3 | -28/+34 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | archive-zip: use deflateInit2() to ask for raw compressed data | René Scharfe | 2013-03-16 | 3 | -28/+34 |
* | | | | | | | | | | | | Merge branch 'ap/combine-diff-ignore-whitespace' | Junio C Hamano | 2013-03-27 | 2 | -7/+161 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Allow combined diff to ignore white-spaces | Antoine Pelisse | 2013-03-14 | 2 | -7/+161 |
* | | | | | | | | | | | | More topics from the second batch for 1.8.3 | Junio C Hamano | 2013-03-26 | 1 | -14/+8 |
* | | | | | | | | | | | | Merge branch 'jc/reflog-reverse-walk' | Junio C Hamano | 2013-03-26 | 3 | -77/+134 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | refs.c: fix fread error handling | John Keeping | 2013-03-23 | 1 | -1/+1 |