Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | RE: [PATCH] Avoid rename/add conflict when contents are identical | Schalk, Ken | 2010-09-03 | 1 | -0/+35 |
* | Merge branch 'gp/pack-refs-remove-empty-dirs' into maint | Junio C Hamano | 2010-09-01 | 1 | -0/+6 |
|\ | |||||
| * | pack-refs: remove newly empty directories | Greg Price | 2010-07-07 | 1 | -0/+6 |
* | | Merge branch 'sg/rerere-gc-old-still-used' into maint | Junio C Hamano | 2010-09-01 | 1 | -3/+11 |
|\ \ | |||||
| * | | rerere: fix overeager gc | SZEDER Gábor | 2010-07-14 | 1 | -3/+11 |
* | | | Merge branch 'dj/fetch-tagopt' into maint | Junio C Hamano | 2010-09-01 | 1 | -0/+41 |
|\ \ \ | |||||
| * | | | fetch: allow command line --tags to override config | Daniel Johnson | 2010-08-14 | 1 | -0/+41 |
* | | | | Merge branch 'da/fix-submodule-sync-superproject-config' into maint | Junio C Hamano | 2010-09-01 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | submodule sync: Update "submodule.<name>.url" | David Aguilar | 2010-08-18 | 1 | -0/+3 |
| |/ / / | |||||
* | | | | Merge branch 'en/rebase-against-rebase-fix' into maint | Junio C Hamano | 2010-09-01 | 1 | -0/+62 |
|\ \ \ \ | |||||
| * | | | | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches | Elijah Newren | 2010-08-12 | 1 | -2/+2 |
| * | | | | t5520-pull: Add testcases showing spurious conflicts from git pull --rebase | Elijah Newren | 2010-08-12 | 1 | -0/+62 |
* | | | | | Merge branch 'maint-1.7.1' into maint | Junio C Hamano | 2010-08-29 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | t0003: add missing && at end of lines | Matthieu Moy | 2010-08-29 | 1 | -5/+5 |
* | | | | | | t3302 (notes): Port to Solaris | Jonathan Nieder | 2010-08-24 | 1 | -1/+1 |
* | | | | | | t7403: add missing &&'s | Jens Lehmann | 2010-08-21 | 1 | -2/+2 |
* | | | | | | Merge branch 'jc/maint-follow-rename-fix' into maint | Junio C Hamano | 2010-08-20 | 1 | -1/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log: test for regression introduced in v1.7.2-rc0~103^2~2 | Ævar Arnfjörð Bjarmason | 2010-08-15 | 1 | -1/+13 |
* | | | | | | | Merge branch 'jn/fix-abbrev' into maint | Junio C Hamano | 2010-08-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | archive: abbreviate substituted commit ids again | Jonathan Nieder | 2010-07-27 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jn/rebase-rename-am' into maint | Junio C Hamano | 2010-08-20 | 3 | -199/+343 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | rebase: protect against diff.renames configuration | Junio C Hamano | 2010-07-23 | 1 | -1/+23 |
| * | | | | | | | t3400 (rebase): whitespace cleanup | Jonathan Nieder | 2010-07-23 | 1 | -90/+92 |
| * | | | | | | | Teach "apply --index-info" to handle rename patches | Junio C Hamano | 2010-07-23 | 1 | -0/+46 |
| * | | | | | | | t4150 (am): futureproof against failing tests | Jonathan Nieder | 2010-07-23 | 1 | -1/+47 |
| * | | | | | | | t4150 (am): style fix | Jonathan Nieder | 2010-07-23 | 2 | -108/+136 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | t/t7003: replace \t with literal tab in sed expression | Brandon Casey | 2010-08-12 | 1 | -1/+1 |
* | | | | | | | index-pack: Don't follow replace refs. | Nelson Elhage | 2010-08-12 | 1 | -0/+6 |
* | | | | | | | fast-import: export correctly marks larger than 2^20-1 | Raja R Harinath | 2010-08-11 | 1 | -0/+57 |
* | | | | | | | t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH | Ævar Arnfjörð Bjarmason | 2010-08-11 | 1 | -3/+2 |
* | | | | | | | diff: strip extra "/" when stripping prefix | Jakub Narebski | 2010-08-11 | 1 | -0/+61 |
* | | | | | | | t7003: fix subdirectory-filter test | Thomas Rast | 2010-08-09 | 1 | -1/+2 |
* | | | | | | | Allow "check-ref-format --branch" from subdirectory | Jonathan Nieder | 2010-08-06 | 1 | -0/+17 |
* | | | | | | | Merge branch 'ab/tap' into maint | Junio C Hamano | 2010-08-02 | 1 | -4/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | test-lib: Remove 3 year old no-op --no-python option | Ævar Arnfjörð Bjarmason | 2010-08-02 | 1 | -3/+0 |
| * | | | | | | | test-lib: Ignore --quiet under a TAP harness | Ævar Arnfjörð Bjarmason | 2010-08-02 | 1 | -1/+3 |
* | | | | | | | | Fix git rebase --continue to work with touched files | David D. Kilzer | 2010-07-28 | 1 | -0/+43 |
* | | | | | | | | Sync with 1.7.1.2 | Junio C Hamano | 2010-07-27 | 1 | -1/+23 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Sync with 1.7.0 series | Junio C Hamano | 2010-07-27 | 1 | -1/+23 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | config --get --path: check for unset $HOME | Jonathan Nieder | 2010-07-27 | 1 | -1/+23 |
| | * | | | | | | Merge branch 'maint-1.6.6' into maint-1.7.0 | Junio C Hamano | 2010-07-25 | 1 | -0/+18 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-07-25 | 1 | -0/+18 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'maint-1.6.4' into maint-1.6.5 | Junio C Hamano | 2010-07-25 | 1 | -0/+18 |
| | | | |\ \ \ \ \ \ | |||||
* | | | | | | | | | | | t3700-add: fix dependence on stdout and stderr buffering | Johannes Sixt | 2010-07-25 | 1 | -3/+6 |
* | | | | | | | | | | | git-rebase--interactive.sh: use printf instead of echo to print commit message | Brandon Casey | 2010-07-25 | 1 | -1/+7 |
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | tests: correct "does reflog exist?" tests | Junio C Hamano | 2010-07-21 | 2 | -49/+11 |
* | | | | | | | | | | t/: work around one-shot variable assignment with test_must_fail | Brandon Casey | 2010-07-21 | 3 | -8/+40 |
* | | | | | | | | | | t/README: correct an exception when breaking a && chain in tests | Jonathan Nieder | 2010-07-21 | 1 | -4/+4 |
* | | | | | | | | | | t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail | Brandon Casey | 2010-07-20 | 2 | -2/+2 |
* | | | | | | | | | | t/t3700: convert two uses of negation operator '!' to use test_must_fail | Brandon Casey | 2010-07-20 | 1 | -2/+2 |