Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/apply-binary-p0' into maint-1.7.11 | Junio C Hamano | 2012-09-12 |
|\ | |||
| * | apply: compute patch->def_name correctly under -p0 | Junio C Hamano | 2012-08-24 |
* | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 | Junio C Hamano | 2012-09-12 |
|\ \ | |||
| * | | specifying ranges: we did not mean to make ".." an empty set | Junio C Hamano | 2012-08-23 |
* | | | Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11 | Junio C Hamano | 2012-09-12 |
|\ \ \ | |||
| * | | | http: prompt for credentials on failed POST | Jeff King | 2012-08-27 |
| * | | | t: test http access to "half-auth" repositories | Jeff King | 2012-08-27 |
| * | | | t: test basic smart-http authentication | Jeff King | 2012-08-27 |
| * | | | t/lib-httpd: recognize */smart/* repos as smart-http | Jeff King | 2012-08-27 |
| * | | | t/lib-httpd: only route auth/dumb to dumb repos | Jeff King | 2012-08-27 |
| * | | | t5550: factor out http auth setup | Jeff King | 2012-08-27 |
| * | | | t5550: put auth-required repo in auth/dumb | Jeff King | 2012-08-27 |
* | | | | Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11 | Junio C Hamano | 2012-09-12 |
|\ \ \ \ | |||
| * | | | | for-each-ref: Fix sort with multiple keys | Kacper Kornet | 2012-08-21 |
| * | | | | t6300: test sort with multiple keys | Kacper Kornet | 2012-08-21 |
* | | | | | Merge branch 'sz/submodule-force-update' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ | |||
| * | | | | | Make 'git submodule update --force' always check out submodules. | Stefan Zager | 2012-08-24 |
* | | | | | | Merge branch 'ph/stash-rerere' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ | |||
| * | | | | | | stash: invoke rerere in case of conflict | Phil Hord | 2012-08-17 |
| * | | | | | | test: git-stash conflict sets up rerere | Phil Hord | 2012-08-17 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ | |||
| * | | | | | | Let submodule command exit with error status if path does not exist | Heiko Voigt | 2012-08-14 |
* | | | | | | | Merge branch 'mz/empty-rebase-test' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | add tests for 'git rebase --keep-empty' | Martin von Zweigbergk | 2012-08-09 |
* | | | | | | | | Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Fix '\ No newline...' annotation in rewrite diffs | Adam Butcher | 2012-08-05 |
* | | | | | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD" | Junio C Hamano | 2012-07-30 |
* | | | | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11 | Junio C Hamano | 2012-09-10 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | receive-pack: do not leak output from auto-gc to standard output | Junio C Hamano | 2012-08-06 |
| * | | | | | | | | | | t/t5400: demonstrate breakage caused by informational message from prune | Brandon Casey | 2012-08-06 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 | Junio C Hamano | 2012-09-10 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | fsck: detect null sha1 in tree entries | Jeff King | 2012-07-29 |
| * | | | | | | | | | | do not write null sha1s to on-disk index | Jeff King | 2012-07-29 |
| * | | | | | | | | | | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'tr/maint-send-email-2047' into maint-1.7.11 | Junio C Hamano | 2012-09-10 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | send-email: improve RFC2047 quote parsing | Thomas Rast | 2012-07-31 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'mk/test-seq' into maint-1.7.11 | Junio C Hamano | 2012-08-24 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||
| * | | | | | | | | tests: Introduce test_seq | MichaĆ Kiedrowicz | 2012-08-04 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'rj/maint-grep-remove-redundant-test' into maint | Junio C Hamano | 2012-08-15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||
| * | | | | | | | t7810-*.sh: Remove redundant test | Ramsay Jones | 2012-07-29 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'kk/maint-commit-tree' into maint | Junio C Hamano | 2012-07-30 |
|\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree | Junio C Hamano | 2012-07-17 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | commit-tree: resurrect command line parsing updates | Junio C Hamano | 2012-07-17 |
* | | | | | | | | | Merge branch 'jv/maint-no-ext-diff' into maint | Junio C Hamano | 2012-07-30 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | diff: test precedence of external diff drivers | Jeff King | 2012-07-19 |
| * | | | | | | | | | diff: correctly disable external_diff with --no-ext-diff | Junio C Hamano | 2012-07-17 |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint | Junio C Hamano | 2012-07-30 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | submodules: don't stumble over symbolic links when cloning recursively | Jens Lehmann | 2012-07-12 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jc/maint-filter-branch-epoch-date' into maint | Junio C Hamano | 2012-07-30 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | |