Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2009-04-29 | 1 | -0/+39 |
|\ | |||||
| * | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-29 | 1 | -0/+39 |
| |\ | |||||
| | * | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-29 | 1 | -0/+39 |
| | |\ | |||||
| | | * | diff -c -p: do not die on submodules | Junio C Hamano | 2009-04-29 | 1 | -0/+39 |
* | | | | merge-recursive: do not die on a conflicting submodule | Junio C Hamano | 2009-04-29 | 1 | -3/+3 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2009-04-28 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-28 | 1 | -0/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-28 | 1 | -0/+4 |
| | |\ \ | | | |/ | |||||
| | | * | grep: fix segfault when "git grep '('" is given | Linus Torvalds | 2009-04-27 | 1 | -0/+4 |
| | * | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-18 | 1 | -0/+9 |
| | |\ \ | | | |/ | |||||
* | | | | t5701: do not get stuck in empty-push/ | Johannes Schindelin | 2009-04-27 | 1 | -2/+2 |
* | | | | t4202: fix typov1.6.3-rc3 | Linus Torvalds | 2009-04-26 | 1 | -1/+1 |
* | | | | t7700-repack: repack -a now works properly, expect success from test | Brandon Casey | 2009-04-25 | 1 | -1/+1 |
* | | | | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' | Brandon Casey | 2009-04-25 | 1 | -1/+1 |
* | | | | t7800: respect NO_PERL | Jeff King | 2009-04-24 | 1 | -0/+5 |
* | | | | graph API: fix a bug in the rendering of octopus merges | Allan Caffee | 2009-04-22 | 1 | -1/+1 |
* | | | | t4202-log: extend test coverage of graphing | Allan Caffee | 2009-04-22 | 1 | -2/+28 |
* | | | | test-lib.sh: Help test_create_repo() find the templates dir | Michael J Gruber | 2009-04-21 | 1 | -1/+1 |
* | | | | Merge branch 'mk/maint-apply-swap' | Junio C Hamano | 2009-04-21 | 1 | -3/+31 |
|\ \ \ \ | |||||
| * | | | | tests: make test-apply-criss-cross-rename more robust | Michał Kiedrowicz | 2009-04-20 | 1 | -3/+31 |
| * | | | | builtin-apply: keep information about files to be deleted | Michał Kiedrowicz | 2009-04-20 | 1 | -1/+1 |
| * | | | | tests: test applying criss-cross rename patch | Michał Kiedrowicz | 2009-04-20 | 1 | -0/+38 |
| |/ / / | |||||
| * | | | Merge branch 'ef/maint-fast-export' into maint | Junio C Hamano | 2009-04-19 | 1 | -0/+15 |
| |\ \ \ | |||||
| | * | | | builtin-fast-export.c: handle nested tags | Erik Faye-Lund | 2009-04-19 | 1 | -2/+2 |
| | * | | | builtin-fast-export.c: fix crash on tagged trees | Erik Faye-Lund | 2009-04-19 | 1 | -3/+2 |
| | * | | | test-suite: adding a test for fast-export with tag variants | Erik Faye-Lund | 2009-04-19 | 1 | -0/+16 |
| * | | | | Merge branch 'jc/maint-shared-literally' into maint | Junio C Hamano | 2009-04-19 | 1 | -4/+8 |
| |\ \ \ \ | |||||
* | | | | | | clone: add test for push on an empty clone. | Matthieu Moy | 2009-04-20 | 1 | -0/+10 |
* | | | | | | Work around ash "alternate value" expansion bug | Ben Jackson | 2009-04-18 | 1 | -0/+10 |
* | | | | | | Merge branch 'nd/archive-attribute' | Junio C Hamano | 2009-04-18 | 2 | -4/+96 |
|\ \ \ \ \ \ | |||||
| * | | | | | | archive test: attributes | René Scharfe | 2009-04-17 | 1 | -0/+91 |
| * | | | | | | archive tests: do not use .gitattributes in working directory | René Scharfe | 2009-04-17 | 1 | -4/+5 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-04-18 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint | Junio C Hamano | 2009-04-18 | 2 | -0/+14 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'js/maint-submodule-checkout' into maint | Junio C Hamano | 2009-04-18 | 1 | -0/+42 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint | Junio C Hamano | 2009-04-18 | 1 | -0/+74 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-04-18 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | init: Do not segfault on big GIT_TEMPLATE_DIR environment variable | Frank Lichtenheld | 2009-04-18 | 1 | -0/+9 |
* | | | | | | | | | | Merge branch 'mk/apply-swap' | Junio C Hamano | 2009-04-17 | 1 | -0/+38 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin-apply: keep information about files to be deleted | Michał Kiedrowicz | 2009-04-15 | 1 | -1/+1 |
| * | | | | | | | | | | tests: test applying criss-cross rename patch | Michał Kiedrowicz | 2009-04-13 | 1 | -0/+38 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/shared-literally' | Junio C Hamano | 2009-04-17 | 1 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Mark t1301 permission test to depend on POSIXPERM | Junio C Hamano | 2009-04-12 | 132 | -599/+3041 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | t1301-shared-repo: fix forced modes test | Johannes Sixt | 2009-04-12 | 1 | -4/+8 |
* | | | | | | | | | | Merge branch 'ns/am-to-empty' | Junio C Hamano | 2009-04-17 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-am: teach git-am to apply a patch to an unborn branch | Nanako Shiraishi | 2009-04-12 | 1 | -0/+15 |
* | | | | | | | | | | | Merge branch 'bw/short-ref-strict' | Junio C Hamano | 2009-04-17 | 1 | -3/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | for-each-ref: utilize core.warnAmbiguousRefs for :short-format | Bert Wesarg | 2009-04-13 | 1 | -3/+15 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2009-04-17 | 1 | -0/+211 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | difftool: add support for a difftool.prompt config variable | David Aguilar | 2009-04-07 | 1 | -0/+64 |