Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/ll-merge-binary-ours' | Junio C Hamano | 2012-09-14 | 1 | -1/+13 |
|\ | |||||
| * | attr: "binary" attribute should choose built-in "binary" merge driver | Junio C Hamano | 2012-09-08 | 1 | -1/+1 |
| * | merge: teach -Xours/-Xtheirs to binary ll-merge driver | Junio C Hamano | 2012-09-08 | 1 | -1/+13 |
* | | Merge branch 'mh/abspath' | Junio C Hamano | 2012-09-14 | 2 | -18/+59 |
|\ \ | |||||
| * | | t0060: split absolute path test in two to exercise some of it on Windows | Johannes Sixt | 2012-09-10 | 1 | -2/+6 |
| * | | t0060: verify that real_path() removes extra slashes | Michael Haggerty | 2012-09-06 | 1 | -0/+18 |
| * | | real_path(): properly handle nonexistent top-level paths | Michael Haggerty | 2012-09-06 | 1 | -1/+1 |
| * | | t0060: verify that real_path() works correctly with absolute paths | Michael Haggerty | 2012-09-06 | 1 | -1/+11 |
| * | | real_path(): reject the empty string | Michael Haggerty | 2012-09-06 | 1 | -1/+1 |
| * | | t0060: verify that real_path() fails if passed the empty string | Michael Haggerty | 2012-09-06 | 1 | -0/+4 |
| * | | absolute_path(): reject the empty string | Michael Haggerty | 2012-09-06 | 1 | -1/+1 |
| * | | t0060: verify that absolute_path() fails if passed the empty string | Michael Haggerty | 2012-09-06 | 1 | -0/+4 |
| * | | t0060: move tests of real_path() from t0000 to here | Michael Haggerty | 2012-09-06 | 2 | -18/+19 |
* | | | Merge branch 'dj/fetch-all-tags' | Junio C Hamano | 2012-09-14 | 1 | -0/+30 |
|\ \ \ | |||||
| * | | | fetch --all: pass --tags/--no-tags through to each remote | Dan Johnson | 2012-09-07 | 1 | -0/+30 |
* | | | | Merge branch 'rj/tap-fix' | Junio C Hamano | 2012-09-14 | 4 | -63/+81 |
|\ \ \ \ | |||||
| * | | | | test-lib.sh: Suppress the "passed all ..." message if no tests run | Ramsay Jones | 2012-09-02 | 1 | -1/+4 |
| * | | | | test-lib.sh: Add check for invalid use of 'skip_all' facility | Ramsay Jones | 2012-09-02 | 1 | -0/+4 |
| * | | | | test-lib.sh: Fix some shell coding style violations | Ramsay Jones | 2012-09-02 | 1 | -22/+38 |
| * | | | | t4016-*.sh: Skip all tests rather than each test | Ramsay Jones | 2012-09-02 | 1 | -11/+9 |
| * | | | | t3902-*.sh: Skip all tests rather than each test | Ramsay Jones | 2012-09-02 | 1 | -16/+15 |
| * | | | | t3300-*.sh: Fix a TAP parse error | Ramsay Jones | 2012-09-02 | 1 | -13/+11 |
* | | | | | Merge branch 'nd/maint-remote-remove' | Junio C Hamano | 2012-09-12 | 2 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | remote: prefer subcommand name 'remove' to 'rm' | Nguyễn Thái Ngọc Duy | 2012-09-06 | 2 | -3/+3 |
| |/ / / / | |||||
| * | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-08-24 | 3 | -2/+23 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
* | | | | | Merge branch 'rj/test-regex' | Junio C Hamano | 2012-09-11 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | test-regex: Add a test to check for a bug in the regex routines | Ramsay Jones | 2012-09-02 | 1 | -0/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'cn/branch-set-upstream-to' | Junio C Hamano | 2012-09-10 | 1 | -0/+70 |
|\ \ \ \ \ | |||||
| * | | | | | branch: deprecate --set-upstream and show help if we detect possible mistaken... | Carlos Martín Nieto | 2012-08-30 | 1 | -0/+34 |
| * | | | | | branch: add --unset-upstream option | Carlos Martín Nieto | 2012-08-30 | 1 | -0/+22 |
| * | | | | | branch: introduce --set-upstream-to | Carlos Martín Nieto | 2012-08-23 | 1 | -0/+14 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'mz/cherry-pick-cmdline-order' | Junio C Hamano | 2012-09-10 | 2 | -0/+25 |
|\ \ \ \ \ | |||||
| * | | | | | cherry-pick/revert: respect order of revisions to pick | Martin von Zweigbergk | 2012-08-30 | 1 | -1/+1 |
| * | | | | | demonstrate broken 'git cherry-pick three one two' | Martin von Zweigbergk | 2012-08-30 | 1 | -0/+15 |
| * | | | | | teach log --no-walk=unsorted, which avoids sorting | Martin von Zweigbergk | 2012-08-30 | 1 | -0/+10 |
* | | | | | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' | Junio C Hamano | 2012-09-10 | 1 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log: fix --quiet synonym for -s | Jeff King | 2012-08-28 | 1 | -0/+12 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'mk/test-seq' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 3 | -2/+23 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'jk/maint-http-half-auth-push' | Junio C Hamano | 2012-09-07 | 6 | -75/+127 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | http: prompt for credentials on failed POST | Jeff King | 2012-08-27 | 1 | -1/+1 |
| * | | | | | | | t: test http access to "half-auth" repositories | Jeff King | 2012-08-27 | 3 | -0/+28 |
| * | | | | | | | t: test basic smart-http authentication | Jeff King | 2012-08-27 | 2 | -0/+25 |
| * | | | | | | | t/lib-httpd: recognize */smart/* repos as smart-http | Jeff King | 2012-08-27 | 1 | -9/+7 |
| * | | | | | | | t/lib-httpd: only route auth/dumb to dumb repos | Jeff King | 2012-08-27 | 1 | -1/+1 |
| * | | | | | | | t5550: factor out http auth setup | Jeff King | 2012-08-27 | 3 | -54/+55 |
| * | | | | | | | t5550: put auth-required repo in auth/dumb | Jeff King | 2012-08-27 | 1 | -9/+9 |
* | | | | | | | | Merge branch 'jc/apply-binary-p0' | Junio C Hamano | 2012-09-07 | 1 | -21/+33 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | apply: compute patch->def_name correctly under -p0 | Junio C Hamano | 2012-08-24 | 1 | -21/+33 |
* | | | | | | | | | Merge branch 'jc/dotdot-is-parent-directory' | Junio C Hamano | 2012-09-07 | 2 | -0/+21 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | specifying ranges: we did not mean to make ".." an empty set | Junio C Hamano | 2012-08-23 | 2 | -0/+21 |
| | |_|/ / / / / / | |/| | | | | | | |